aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-generate-patch.txt
diff options
context:
space:
mode:
authorAdam Monsen <haircut@gmail.com>2011-03-08 12:51:37 -0800
committerJunio C Hamano <gitster@pobox.com>2011-03-08 14:44:07 -0800
commite0adb84cc65a399629fbb1b2d0e5764330bf4f39 (patch)
tree586b4313dbc490d6e1a5eeba8b0435b4897e48ec /Documentation/diff-generate-patch.txt
parent841d81180e6754b18559220087decf01f504b203 (diff)
downloadgit-e0adb84cc65a399629fbb1b2d0e5764330bf4f39.tar.gz
git-e0adb84cc65a399629fbb1b2d0e5764330bf4f39.tar.xz
diff format documentation: clarify --cc and -c
The description was unclear if -c or --cc was the default (--cc is for some commands), and incorrectly implied that the default applies to all the diff generating commands. Most importantly, "log" does not default to "--cc" (it defaults to "--no-merges") and "log -p" obeys the user's wish to see non-combined format. Only "diff" (during merge and three-blob comparison) and "show" use --cc as the default. Signed-off-by: Adam Monsen <haircut@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
-rw-r--r--Documentation/diff-generate-patch.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 3ac2beac6..c57460c03 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:
------------