diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-06-13 12:29:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-06-13 12:29:45 -0700 |
| commit | 6901ffe80cefba50ad3e974b53c2457973e1425d (patch) | |
| tree | c9c375ac1a6a1934b4097690d027b0c3224c92c3 /Documentation/diff-options.txt | |
| parent | 6d2a88c7289b56999426354f44b536255b57c5c8 (diff) | |
| parent | 9d484b92ed38c2222b6880e0bc2b572fdc837dbd (diff) | |
| download | git-6901ffe80cefba50ad3e974b53c2457973e1425d.tar.gz | |
Merge branch 'jc/diff-s-with-other-options'
The "-s" (silent, squelch) option of the "diff" family of commands
did not interact with other options that specify the output format
well. This has been cleaned up so that it will clear all the
formatting options given before.
* jc/diff-s-with-other-options:
diff: fix interaction between the "-s" option and other options
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 08ab86189a..9f33f88771 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -35,8 +35,11 @@ endif::git-diff[] -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`. + Suppress all output from the diff machinery. Useful for + commands like `git show` that show the patch by default to + squelch their output, or to cancel the effect of options like + `--patch`, `--stat` earlier on the command line in an alias. + endif::git-format-patch[] ifdef::git-log[] |