diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-29 23:09:55 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-29 23:09:55 +0100 |
| commit | 8183b63ff6a9c7eec5555e51e127e712efb64704 (patch) | |
| tree | 0021e183d84e4359b66485a9d74c951a93ab9264 /Documentation/diff-options.txt | |
| parent | The twenty-first batch (diff) | |
| parent | t/README: fix multi-prerequisite example (diff) | |
| download | git-8183b63ff6a9c7eec5555e51e127e712efb64704.tar.xz git-8183b63ff6a9c7eec5555e51e127e712efb64704.zip | |
Merge branch 'sn/typo-grammo-phraso-fixes'
Many typos, ungrammatical sentences and wrong phrasing have been
fixed.
* sn/typo-grammo-phraso-fixes:
t/README: fix multi-prerequisite example
doc/gitk: s/sticked/stuck/
git-jump: admit to passing merge mode args to ls-files
doc/diff-options: improve wording of the log.diffMerges mention
doc: fix some typos, grammar and wording issues
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 1a75c28bca..53ec3c9a34 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -76,7 +76,7 @@ off, none:: + on, m:: Make diff output for merge commits to be shown in the default - format. The default format could be changed using + format. The default format can be changed using `log.diffMerges` configuration variable, whose default value is `separate`. + @@ -314,7 +314,7 @@ ifndef::git-format-patch[] -z:: ifdef::git-log[] - Separate the commits with NULs instead of with new newlines. + Separate the commits with NULs instead of newlines. + Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators. |