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>

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 0e45b58d8332cc9f48e0e18165f536adb94a5c6f..8c8f35b7a762d42d3c45ff9f4eee1cb32d3917b6 100644 (file)
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -93,11 +93,11 @@ 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
        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 hunks that show differences from only one
-       parent, or show the same change from all but one parent
-       for an Octopus merge.  When this optimization makes all
-       hunks disappear, the commit itself and the commit log
-       message is not shown, just like in any other "empty diff" case.
+       by omitting uninteresting hunks whose the 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
+       "empty diff" case.

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

diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index b6f5d87e723bec4f00a3929274c43bfd478cc083..3aa38097e6350a02c50873d5c670e108003fab22 100644 (file)
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -112,9 +112,9 @@ options may be given. See linkgit:git-diff-files[1] for more options.
 --cc::
 
        This flag implies the '-c' options and further compresses the
 --cc::
 
        This flag implies the '-c' options and further compresses the

-       patch output by omitting hunks that show differences from only
-       one parent, or show the same change from all but one parent for
-       an Octopus merge.
+       patch output by omitting uninteresting hunks whose contents in
+       the parents have only two variants and the merge result picks
+       one of them without modification.

 
 -r::
 
 
 -r::