summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-23 16:16:05 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-23 16:57:13 -0700
commitea3d988df7b0985fa164c7ace13e4c961c607a22 (patch)
tree32a1a4dd91af61fd226d1046a7b9f93bb5a26bcd /Documentation/git-diff-tree.txt
parenta31c00b00eeadbc4b87ce2d578688e9b369a50fe (diff)
downloadgit-ea3d988df7b0985fa164c7ace13e4c961c607a22.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>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
-rw-r--r--Documentation/git-diff-tree.txt10
1 files changed, 5 insertions, 5 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