From 34801cab72e8262d2585f72f15b62a397f0c6c1a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 28 Jan 2006 02:19:22 -0800 Subject: Documentation: diff -c/--cc Signed-off-by: Junio C Hamano --- Documentation/git-diff-tree.txt | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'Documentation/git-diff-tree.txt') diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 91fb130497..dd46d4f05d 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -9,8 +9,9 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object SYNOPSIS -------- [verse] -'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] [-t] [-r] - [--root] [] [] [...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] + [-t] [-r] [-c | --cc] [--root] [] + [] [...] DESCRIPTION ----------- @@ -80,6 +81,20 @@ 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 + (which means it is useful only when the command is given + one , 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 + 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, unless '-m' is specified. + Limiting Output --------------- -- cgit v1.2.3