diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-08 21:37:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-08 21:37:23 -0800 |
| commit | f7c6c426ca193773c6a9879d33a3d6f7d835bc8d (patch) | |
| tree | fdf114177a7bb91ee5705bf688cc92d2bbb8cd24 /Documentation/diff-generate-patch.txt | |
| parent | transport-helper.c: fix check for (size_t < 0) (diff) | |
| parent | SubmittingPatches: clarify the expected commit log description (diff) | |
| download | tgif-f7c6c426ca193773c6a9879d33a3d6f7d835bc8d.tar.xz | |
Merge branch 'maint'
* maint:
SubmittingPatches: clarify the expected commit log description
diff format documentation: clarify --cc and -c
rev-list-options.txt: typo fix
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 3ac2beac62..c57460c03d 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -74,10 +74,13 @@ separate lines indicate the old and the new mode. combined diff format -------------------- -"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or -'--cc' option to produce 'combined diff'. For showing a merge commit -with "git log -p", this is the default format; you can force showing -full diff with the '-m' option. +Any diff-generating command can take the `-c` or `--cc` option to +produce a 'combined diff' when showing a merge. This is the default +format when showing merges with linkgit:git-diff[1] or +linkgit:git-show[1]. Note also that you can give the `-m' option to any +of these commands to force generation of diffs with individual parents +of a merge. + A 'combined diff' format looks like this: ------------ |