diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-10 16:44:59 -0700 |
| commit | 6d46a23bf6e009487166f044b8c759aa734b8f90 (patch) | |
| tree | b6b3d18ff7a60585921674bc043fe6dd514a3f8c /Documentation/git-diff-tree.txt | |
| parent | 52b70d56bd23811003a72866cc23a0a44b9da1b7 (diff) | |
| parent | 5910e997754e0a03f25457965bd9faf80f2f9854 (diff) | |
| download | git-6d46a23bf6e009487166f044b8c759aa734b8f90.tar.xz | |
Merge branch 'master' into jc/diff
* master:
Make "--parents" logs also be incremental
Retire diffcore-pathspec.
Improve the git-diff-tree -c/-cc documentation
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 9153e4cf2a..2169169850 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 |