diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-01-28 02:38:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-01-28 02:38:19 -0800 |
| commit | fb56a964f2f60e657c136ccbf316f127d6d21c36 (patch) | |
| tree | 1173c604d9dfd5049170ad90c1b48fc58ff1fc94 /git-diff-tree.txt | |
| parent | 9be1897ab8f6a7e90e1582acd9c43071d181c70f (diff) | |
| download | git-htmldocs-fb56a964f2f60e657c136ccbf316f127d6d21c36.tar.gz | |
Autogenerated HTML docs for v1.1.5-g3480
Diffstat (limited to 'git-diff-tree.txt')
| -rw-r--r-- | git-diff-tree.txt | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 91fb13049..dd46d4f05 100644 --- a/git-diff-tree.txt +++ b/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 --------------- |