tree 1f8a76636533b3f22006fef018e3dc30fbbc3bf8
parent 8827a58cf0ac7bee4ac8d357236975ead9783df3
parent 4ba258b7e1020e8e3f321ca2df01e34cd71bee88
author Junio C Hamano <gitster@pobox.com> 1374517407 -0700
committer Junio C Hamano <gitster@pobox.com> 1374517407 -0700

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