git/t/t4013/diff.show_--first-parent_ma...

$ git show --first-parent master
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
Merge: 9a6d494 c7a2ab9
Author: A U Thor <author@example.com>
Date:   Mon Jun 26 00:04:00 2006 +0000

    Merge branch 'side'

diff --git a/dir/sub b/dir/sub
index cead32e..992913c 100644
--- a/dir/sub
+++ b/dir/sub
@@ -4,3 +4,5 @@ C
 D
 E
 F
+1
+2
diff --git a/file0 b/file0
index b414108..10a8a9f 100644
--- a/file0
+++ b/file0
@@ -4,3 +4,6 @@
 4
 5
 6
+A
+B
+C
$
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> 2010-03-09 11:22:54 +03:00			`$ git show --first-parent master`
			`commit 59d314ad6f356dd08601a4cd5e530381da3e3c64`
			`Merge: 9a6d494 c7a2ab9`
			`Author: A U Thor <author@example.com>`
			`Date: Mon Jun 26 00:04:00 2006 +0000`

			`Merge branch 'side'`

			`diff --git a/dir/sub b/dir/sub`
			`index cead32e..992913c 100644`
			`--- a/dir/sub`
			`+++ b/dir/sub`
			`@@ -4,3 +4,5 @@ C`
			`D`
			`E`
			`F`
			`+1`
			`+2`
			`diff --git a/file0 b/file0`
			`index b414108..10a8a9f 100644`
			`--- a/file0`
			`+++ b/file0`
			`@@ -4,3 +4,6 @@`
			`4`
			`5`
			`6`
			`+A`
			`+B`
			`+C`
			`$`