diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-24 01:16:05 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-24 01:57:13 +0200 |
| commit | ea3d988df7b0985fa164c7ace13e4c961c607a22 (patch) | |
| tree | 32a1a4dd91af61fd226d1046a7b9f93bb5a26bcd | |
| parent | am --abort: Add to bash-completion and mention in git-rerere documentation (diff) | |
| download | git-ea3d988df7b0985fa164c7ace13e4c961c607a22.tar.xz git-ea3d988df7b0985fa164c7ace13e4c961c607a22.zip | |
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 0e45b58d83..8c8f35b7a7 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 b6f5d87e72..3aa38097e6 100644 --- 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:: |