| commit | 2bf6587349e31b582dae47954b1a334052230e28 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Mar 2010 08:22:54 +0000 (9 00:22 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 9 Mar 2010 09:11:19 +0000 (9 01:11 -0800) | ||
| tree | 4cd84f9e1fdde96fcbdad2cec1c4996542140879 | treesnapshot (tar.gz zip) |
| parent | b44900599710c700c1bf164d3753eb7f8eb6c18a | commitdiff |
show --first-parent/-m: do not default to --cc
Given that "git show" always shows some diff and does not walk the history
by default, it is natural to expect "git show --first-parent" to show the
difference between the given commit and its first parent. It also would
be natural, given that "--cc" is the default, "git show -m" to show
pairwise difference from each of the parents.
We however always defaulted to --cc and there was no way to turn it off.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Given that "git show" always shows some diff and does not walk the history
by default, it is natural to expect "git show --first-parent" to show the
difference between the given commit and its first parent. It also would
be natural, given that "--cc" is the default, "git show -m" to show
pairwise difference from each of the parents.
We however always defaulted to --cc and there was no way to turn it off.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-log.c | diffblobblamehistory | |
| t/t4013-diff-various.sh | diffblobblamehistory | |
| t/t4013/diff.show_--first-parent_master | [new file with mode: 0644] | blob |
| t/t4013/diff.show_-m_master | [new file with mode: 0644] | blob |