From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 22 Jul 2013 18:23:27 +0000 (-0700)
Subject: Merge branch 'mm/diff-no-patch-synonym-to-s'
X-Git-Tag: v1.8.4-rc0~32
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e2ecd252b5e3c90c211075ba9d1017379782708b?ds=inline;hp=--cc

Merge branch 'mm/diff-no-patch-synonym-to-s'

"git show -s" was less discoverable than it should be.

* mm/diff-no-patch-synonym-to-s:
Documentation/git-log.txt: capitalize section names
Documentation: move description of -s, --no-patch to diff-options.txt
Documentation/git-show.txt: include common diff options, like git-log.txt
diff: allow --patch & cie to override -s/--no-patch
diff: allow --no-patch as synonym for -s
t4000-diff-format.sh: modernize style
---

e2ecd252b5e3c90c211075ba9d1017379782708b