Documentation: clarify diff --cc
The definition of an "uninteresting" hunk was not in line with reality. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 23, 2008 at 16:16 UTC
ea3d988df7b0985fa164c7ace13e4c961c607a22
2 files changed
+8
-8
Documentation/git-diff-tree.txt
+5
-5
@@ -93,11 +93,11 @@ include::pretty-options.txt[]
93
This flag changes the way a merge commit patch is displayed,
94
in a similar way to the '-c' option. It implies the '-c'
95
and '-p' options and further compresses the patch output
96
- by omitting hunks that show differences from only one
97
- parent, or show the same change from all but one parent
98
- for an Octopus merge. When this optimization makes all
99
- hunks disappear, the commit itself and the commit log
100
- message is not shown, just like in any other "empty diff" case.
96
+ by omitting uninteresting hunks whose the contents in the parents
97
+ have only two variants and the merge result picks one of them
98
+ without modification. When all hunks are uninteresting, the commit
99
+ itself and the commit log message is not shown, just like in any other
100
+ "empty diff" case.
101
102
--always::
103
Show the commit itself and the commit log message even
Documentation/rev-list-options.txt
+3
-3
@@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options.
112
--cc::
113
114
This flag implies the '-c' options and further compresses the
115
- patch output by omitting hunks that show differences from only
116
- one parent, or show the same change from all but one parent for
117
- an Octopus merge.
115
+ patch output by omitting uninteresting hunks whose contents in
116
+ the parents have only two variants and the merge result picks
117
+ one of them without modification.
118
119
-r::
120