diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 08:45:08 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 21:06:29 +0200 |
| commit | 859a6d6045e338a337cb7499100b1fa31c367fbf (patch) | |
| tree | efe92f5906cedbb2ae73d02644c2c034bb81a87f /Documentation/git-diff-tree.txt | |
| parent | documentation: add missing words (diff) | |
| download | git-859a6d6045e338a337cb7499100b1fa31c367fbf.tar.xz git-859a6d6045e338a337cb7499100b1fa31c367fbf.zip | |
documentation: remove extraneous words
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 81caad5c95..37ca32c396 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -104,7 +104,7 @@ include::pretty-options.txt[] This flag changes the way a merge commit patch is displayed, in a similar way to the `-c` option. It implies the `-c` and `-p` options and further compresses the patch output - by omitting uninteresting hunks whose the contents in the parents + by omitting uninteresting hunks whose contents in the parents have only two variants and the merge result picks one of them without modification. When all hunks are uninteresting, the commit itself and the commit log message is not shown, just like in any other |