summaryrefslogtreecommitdiff
path: root/t/t4013-diff-various.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-09 00:22:54 -0800
committerJunio C Hamano <gitster@pobox.com>2010-03-09 01:11:19 -0800
commit2bf6587349e31b582dae47954b1a334052230e28 (patch)
tree4cd84f9e1fdde96fcbdad2cec1c4996542140879 /t/t4013-diff-various.sh
parentb44900599710c700c1bf164d3753eb7f8eb6c18a (diff)
downloadgit-2bf6587349e31b582dae47954b1a334052230e28.tar.gz
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>
Diffstat (limited to 't/t4013-diff-various.sh')
-rwxr-xr-xt/t4013-diff-various.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 8dd93d9a19..dae6358516 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -239,6 +239,8 @@ show --root initial
show side
show master
show -c master
+show -m master
+show --first-parent master
show --stat side
show --stat --summary side
show --patch-with-stat side