diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:23:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:23:27 -0700 |
| commit | e2ecd252b5e3c90c211075ba9d1017379782708b (patch) | |
| tree | 1f8a76636533b3f22006fef018e3dc30fbbc3bf8 /Documentation/git-show.txt | |
| parent | Merge branch 'dw/request-pull-diag' (diff) | |
| parent | Documentation/git-log.txt: capitalize section names (diff) | |
| download | tgif-e2ecd252b5e3c90c211075ba9d1017379782708b.tar.xz | |
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
Diffstat (limited to 'Documentation/git-show.txt')
| -rw-r--r-- | Documentation/git-show.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index ae4edcccfb..4e617e6979 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -45,6 +45,15 @@ include::pretty-options.txt[] include::pretty-formats.txt[] +COMMON DIFF OPTIONS +------------------- + +:git-log: 1 +include::diff-options.txt[] + +include::diff-generate-patch.txt[] + + EXAMPLES -------- |