Merge git://repo.or.cz/git-gui

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
-       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::