]> git.ipfire.org Git - thirdparty/git.git/blame - t/t4013/diff.log_-p_--first-parent_master
fmt-merge-msg: stop treating `master` specially
[thirdparty/git.git] / t / t4013 / diff.log_-p_--first-parent_master
CommitLineData
126f431a
JH
1$ git log -p --first-parent master
2commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3Merge: 9a6d494 c7a2ab9
4Author: A U Thor <author@example.com>
5Date: Mon Jun 26 00:04:00 2006 +0000
6
489947ce 7 Merge branch 'side' into master
126f431a
JH
8
9commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
10Author: A U Thor <author@example.com>
11Date: Mon Jun 26 00:02:00 2006 +0000
12
13 Third
14
15diff --git a/dir/sub b/dir/sub
16index 8422d40..cead32e 100644
17--- a/dir/sub
18+++ b/dir/sub
19@@ -2,3 +2,5 @@ A
20 B
21 C
22 D
23+E
24+F
25diff --git a/file1 b/file1
26new file mode 100644
27index 0000000..b1e6722
28--- /dev/null
29+++ b/file1
30@@ -0,0 +1,3 @@
31+A
32+B
33+C
34
35commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
36Author: A U Thor <author@example.com>
37Date: Mon Jun 26 00:01:00 2006 +0000
38
39 Second
40
41 This is the second commit.
42
43diff --git a/dir/sub b/dir/sub
44index 35d242b..8422d40 100644
45--- a/dir/sub
46+++ b/dir/sub
47@@ -1,2 +1,4 @@
48 A
49 B
50+C
51+D
52diff --git a/file0 b/file0
53index 01e79c3..b414108 100644
54--- a/file0
55+++ b/file0
56@@ -1,3 +1,6 @@
57 1
58 2
59 3
60+4
61+5
62+6
63diff --git a/file2 b/file2
64deleted file mode 100644
65index 01e79c3..0000000
66--- a/file2
67+++ /dev/null
68@@ -1,3 +0,0 @@
69-1
70-2
71-3
72
73commit 444ac553ac7612cc88969031b02b3767fb8a353a
74Author: A U Thor <author@example.com>
75Date: Mon Jun 26 00:00:00 2006 +0000
76
77 Initial
78$