9ab89a2439
When using "--first-parent" to consider history as a single line of commits, git-log still defaults to treating merges specially, even though they could be considered as single commits in the linearized history (that just introduce all of the changes from the second and higher parents). Let's instead have "--first-parent" imply "-m", which makes something like: git log --first-parent -p do what you'd expect. Likewise: git log --first-parent -Sfoo will find "foo" in merge commits. No new test is needed; we'll tweak the output of the existing "--first-parent -p" test, which now matches the "-m --first-parent -p" test. The unchanged existing test for "--no-diff-merges" confirms that the user can get the old behavior if they want. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
101 lines
1.5 KiB
Plaintext
101 lines
1.5 KiB
Plaintext
$ git log -p --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' into master
|
|
|
|
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
|
|
|
|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:02:00 2006 +0000
|
|
|
|
Third
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 8422d40..cead32e 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -2,3 +2,5 @@ A
|
|
B
|
|
C
|
|
D
|
|
+E
|
|
+F
|
|
diff --git a/file1 b/file1
|
|
new file mode 100644
|
|
index 0000000..b1e6722
|
|
--- /dev/null
|
|
+++ b/file1
|
|
@@ -0,0 +1,3 @@
|
|
+A
|
|
+B
|
|
+C
|
|
|
|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:01:00 2006 +0000
|
|
|
|
Second
|
|
|
|
This is the second commit.
|
|
|
|
diff --git a/dir/sub b/dir/sub
|
|
index 35d242b..8422d40 100644
|
|
--- a/dir/sub
|
|
+++ b/dir/sub
|
|
@@ -1,2 +1,4 @@
|
|
A
|
|
B
|
|
+C
|
|
+D
|
|
diff --git a/file0 b/file0
|
|
index 01e79c3..b414108 100644
|
|
--- a/file0
|
|
+++ b/file0
|
|
@@ -1,3 +1,6 @@
|
|
1
|
|
2
|
|
3
|
|
+4
|
|
+5
|
|
+6
|
|
diff --git a/file2 b/file2
|
|
deleted file mode 100644
|
|
index 01e79c3..0000000
|
|
--- a/file2
|
|
+++ /dev/null
|
|
@@ -1,3 +0,0 @@
|
|
-1
|
|
-2
|
|
-3
|
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
|
Author: A U Thor <author@example.com>
|
|
Date: Mon Jun 26 00:00:00 2006 +0000
|
|
|
|
Initial
|
|
$
|