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>
Adam Monsen committed
Mar 8, 2011 at 12:51 UTC
e0adb84cc65a399629fbb1b2d0e5764330bf4f39
1 file changed
+7
-4
Documentation/diff-generate-patch.txt
+7
-4
@@ -74,10 +74,13 @@ separate lines indicate the old and the new mode.
74
combined diff format
75
--------------------
76
77
-"git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
78
-'--cc' option to produce 'combined diff'. For showing a merge commit
79
-with "git log -p", this is the default format; you can force showing
80
-full diff with the '-m' option.
77
+Any diff-generating command can take the `-c` or `--cc` option to
78
+produce a 'combined diff' when showing a merge. This is the default
79
+format when showing merges with linkgit:git-diff[1] or
80
+linkgit:git-show[1]. Note also that you can give the `-m' option to any
81
+of these commands to force generation of diffs with individual parents
82
+of a merge.
83
+
84
A 'combined diff' format looks like this:
85
86
------------