summaryrefslogtreecommitdiff
path: root/Documentation/SubmittingPatches
diff options
context:
space:
mode:
authorLibravatar Adam Monsen <haircut@gmail.com>2011-03-08 12:51:37 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-03-08 14:44:07 -0800
commite0adb84cc65a399629fbb1b2d0e5764330bf4f39 (patch)
tree586b4313dbc490d6e1a5eeba8b0435b4897e48ec /Documentation/SubmittingPatches
parentrev-list-options.txt: typo fix (diff)
downloadtgif-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/SubmittingPatches')
0 files changed, 0 insertions, 0 deletions