diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-03-25 00:38:53 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-03-25 00:38:53 +0000 |
| commit | 3166736468c0b21727d059d09468111c5a3163c4 (patch) | |
| tree | f94473e9050b0b159edbdec0a0619f4d8d57c11d /rev-list-options.txt | |
| parent | 9ccf664de57a05c6417f1fe46f6c6b55322f218c (diff) | |
| download | git-htmldocs-3166736468c0b21727d059d09468111c5a3163c4.tar.gz | |
Autogenerated HTML docs for v1.7.0.3-291-g5e4f
Diffstat (limited to 'rev-list-options.txt')
| -rw-r--r-- | rev-list-options.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index 81c0e6f18..b9fb7a86b 100644 --- a/rev-list-options.txt +++ b/rev-list-options.txt @@ -108,8 +108,8 @@ options may be given. See linkgit:git-diff-files[1] for more options. -c:: - This flag changes the way a merge commit is displayed. It shows - the differences from each of the parents to the merge result + With this option, diff output for a merge commit + 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. Furthermore, it lists only files which were modified from all parents. @@ -121,6 +121,15 @@ options may be given. See linkgit:git-diff-files[1] for more options. the parents have only two variants and the merge result picks one of them without modification. +-m:: + + This flag makes the merge commits show the full diff like + regular commits; for each merge parent, a separate log entry + and diff is generated. An exception is that only diff against + the first parent is shown when '--first-parent' option is given; + in that case, the output represents the changes the merge + brought _into_ the then-current branch. + -r:: Show recursive diffs. |