diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-23 16:16:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-01 23:00:42 -0700 |
| commit | b1264da8637dc991b84e329c2c4958c1332d069f (patch) | |
| tree | 93aee511505ea2d50d3c53a4cfb1ec77db8dcd0f | |
| parent | 31f4e768a4b53419a1de9c4006c7b3747fc356eb (diff) | |
| download | git-b1264da8637dc991b84e329c2c4958c1332d069f.tar.gz | |
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>
| -rw-r--r-- | Documentation/git-diff-tree.txt | 10 | ||||
| -rw-r--r-- | Documentation/rev-list-options.txt | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 56caeb2d26..f4fbec48d8 100644 --- 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 - 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 diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 37dd1d61ea..f69260f4c0 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -108,9 +108,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:: |