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>
This commit is contained in:
parent
a31c00b00e
commit
ea3d988df7
@ -93,11 +93,11 @@ include::pretty-options.txt[]
|
|||||||
This flag changes the way a merge commit patch is displayed,
|
This flag changes the way a merge commit patch is displayed,
|
||||||
in a similar way to the '-c' option. It implies the '-c'
|
in a similar way to the '-c' option. It implies the '-c'
|
||||||
and '-p' options and further compresses the patch output
|
and '-p' options and further compresses the patch output
|
||||||
by omitting hunks that show differences from only one
|
by omitting uninteresting hunks whose the contents in the parents
|
||||||
parent, or show the same change from all but one parent
|
have only two variants and the merge result picks one of them
|
||||||
for an Octopus merge. When this optimization makes all
|
without modification. When all hunks are uninteresting, the commit
|
||||||
hunks disappear, the commit itself and the commit log
|
itself and the commit log message is not shown, just like in any other
|
||||||
message is not shown, just like in any other "empty diff" case.
|
"empty diff" case.
|
||||||
|
|
||||||
--always::
|
--always::
|
||||||
Show the commit itself and the commit log message even
|
Show the commit itself and the commit log message even
|
||||||
|
@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options.
|
|||||||
--cc::
|
--cc::
|
||||||
|
|
||||||
This flag implies the '-c' options and further compresses the
|
This flag implies the '-c' options and further compresses the
|
||||||
patch output by omitting hunks that show differences from only
|
patch output by omitting uninteresting hunks whose contents in
|
||||||
one parent, or show the same change from all but one parent for
|
the parents have only two variants and the merge result picks
|
||||||
an Octopus merge.
|
one of them without modification.
|
||||||
|
|
||||||
-r::
|
-r::
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user