summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-04-09 13:43:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-09 18:11:19 (GMT)
commita13ba129cdc66b60eef177696084ff80034069b7 (patch)
tree6a664bfa8b8442c61bb44afdc34423e5c6006e41
parent0ed49a3ed9ab9747f7916c928d50aa0bf4d2c81d (diff)
downloadgit-a13ba129cdc66b60eef177696084ff80034069b7.zip
git-a13ba129cdc66b60eef177696084ff80034069b7.tar.gz
git-a13ba129cdc66b60eef177696084ff80034069b7.tar.bz2
Improve the git-diff-tree -c/-cc documentation
This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-diff-tree.txt25
1 files changed, 16 insertions, 9 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 9153e4c..2169169 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -60,7 +60,8 @@ separated with a single space are given.
-m::
By default, "git-diff-tree --stdin" does not show
differences for merge commits. With this flag, it shows
- differences to that commit from all of its parents.
+ differences to that commit from all of its parents. See
+ also '-c'.
-s::
By default, "git-diff-tree --stdin" shows differences,
@@ -81,19 +82,25 @@ separated with a single space are given.
git-diff-tree outputs a line with the commit ID when
applicable. This flag suppressed the commit ID output.
--c,--cc::
- These flags change the way a merge commit is displayed
+-c::
+ This flag changes the way a merge commit is displayed
(which means it is useful only when the command is given
one <tree-ish>, or '--stdin'). It shows the differences
- from each of the parents to the merge result
- simultaneously, instead of showing pairwise diff between
- a parent and the result one at a time, which '-m' option
- output does. '--cc' further compresses the output by
- omiting hunks that show differences from only one
+ from each of the parents to the merge result simultaneously
+ instead of showing pairwise diff between a parent and the
+ result one at a time (which is what the '-m' option does).
+ Furthermore, it lists only files which were modified
+ from all parents.
+
+-cc::
+ 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 any other "empty diff" cases.
+ message is not shown, just like in any other "empty diff" case.
--always::
Show the commit itself and the commit log message even