diff options
| author | Adam Monsen <haircut@gmail.com> | 2011-03-08 23:51:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 01:44:07 +0300 |
| commit | e0adb84cc65a399629fbb1b2d0e5764330bf4f39 (patch) | |
| tree | 586b4313dbc490d6e1a5eeba8b0435b4897e48ec /t/t4013-diff-various.sh | |
| parent | 841d81180e6754b18559220087decf01f504b203 (diff) | |
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 't/t4013-diff-various.sh')
0 files changed, 0 insertions, 0 deletions