Skip to content

Commit a13ba12

Browse files
Petr BaudisJunio C Hamano
Petr Baudis
authored and
Junio C Hamano
committed
Improve the git-diff-tree -c/-cc documentation
This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 0ed49a3 commit a13ba12

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

‎Documentation/git-diff-tree.txt‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ separated with a single space are given.
6060
-m::
6161
By default, "git-diff-tree --stdin" does not show
6262
differences for merge commits. With this flag, it shows
63-
differences to that commit from all of its parents.
63+
differences to that commit from all of its parents. See
64+
also '-c'.
6465

6566
-s::
6667
By default, "git-diff-tree --stdin" shows differences,
@@ -81,19 +82,25 @@ separated with a single space are given.
8182
git-diff-tree outputs a line with the commit ID when
8283
applicable. This flag suppressed the commit ID output.
8384

84-
-c,--cc::
85-
These flags change the way a merge commit is displayed
85+
-c::
86+
This flag changes the way a merge commit is displayed
8687
(which means it is useful only when the command is given
8788
one <tree-ish>, or '--stdin'). It shows the differences
88-
from each of the parents to the merge result
89-
simultaneously, instead of showing pairwise diff between
90-
a parent and the result one at a time, which '-m' option
91-
output does. '--cc' further compresses the output by
92-
omiting hunks that show differences from only one
89+
from each of the parents to the merge result simultaneously
90+
instead of showing pairwise diff between a parent and the
91+
result one at a time (which is what the '-m' option does).
92+
Furthermore, it lists only files which were modified
93+
from all parents.
94+
95+
-cc::
96+
This flag changes the way a merge commit patch is displayed,
97+
in a similar way to the '-c' option. It implies the '-c'
98+
and '-p' options and further compresses the patch output
99+
by omitting hunks that show differences from only one
93100
parent, or show the same change from all but one parent
94101
for an Octopus merge. When this optimization makes all
95102
hunks disappear, the commit itself and the commit log
96-
message is not shown, just like any other "empty diff" cases.
103+
message is not shown, just like in any other "empty diff" case.
97104

98105
--always::
99106
Show the commit itself and the commit log message even

0 commit comments

Comments
 (0)