diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-28 02:19:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 02:26:30 -0800 |
| commit | 34801cab72e8262d2585f72f15b62a397f0c6c1a (patch) | |
| tree | f2d70aecfac97534deb3ac925c45df3819986e66 /Documentation/git-diff-tree.txt | |
| parent | diff-files -c/--cc: combine only when both ours and theirs exist. (diff) | |
| download | tgif-34801cab72e8262d2585f72f15b62a397f0c6c1a.tar.xz | |
Documentation: diff -c/--cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 19 |
1 files changed, 17 insertions, 2 deletions
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] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] + [-t] [-r] [-c | --cc] [--root] [<common diff options>] + <tree-ish> [<tree-ish>] [<path>...] 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 <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 + 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 --------------- |