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/diff-options.txt | |
| parent | 8827a58cf0ac7bee4ac8d357236975ead9783df3 (diff) | |
| parent | 4ba258b7e1020e8e3f321ca2df01e34cd71bee88 (diff) | |
| download | git-e2ecd252b5e3c90c211075ba9d1017379782708b.tar.gz git-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/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 87e92d653..bbed2cd79 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -26,6 +26,11 @@ ifndef::git-format-patch[] {git-diff? This is the default.} endif::git-format-patch[] +-s:: +--no-patch:: + Suppress diff output. Useful for commands like `git show` that + show the patch by default, or to cancel the effect of `--patch`. + -U<n>:: --unified=<n>:: Generate diffs with <n> lines of context instead of |