Merge branch 'mm/diff-no-patch-synonym-to-s'
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:27 +0000 (11:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:23:27 +0000 (11:23 -0700)
"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

1  2 
Documentation/diff-options.txt
Documentation/git-log.txt
Documentation/rev-list-options.txt
diff.c

Simple merge
Simple merge
Simple merge
diff --cc diff.c
Simple merge