]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
Merge branch 'ap/maint-diff-rename-avoid-overlap' into maint
[thirdparty/git.git] / t / t4013 / diff.format-patch_--stdout_--cover-letter_-n_initial..master^
1 $ git format-patch --stdout --cover-letter -n initial..master^
2 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
3 From: C O Mitter <committer@example.com>
4 Date: Mon, 26 Jun 2006 00:06:00 +0000
5 Subject: [DIFFERENT_PREFIX 0/2] *** SUBJECT HERE ***
6
7 *** BLURB HERE ***
8
9 A U Thor (2):
10 Second
11 Third
12
13 dir/sub | 4 ++++
14 file0 | 3 +++
15 file1 | 3 +++
16 file2 | 3 ---
17 4 files changed, 10 insertions(+), 3 deletions(-)
18 create mode 100644 file1
19 delete mode 100644 file2
20
21 --
22 g-i-t--v-e-r-s-i-o-n
23
24 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
25 From: A U Thor <author@example.com>
26 Date: Mon, 26 Jun 2006 00:01:00 +0000
27 Subject: [DIFFERENT_PREFIX 1/2] Second
28
29 This is the second commit.
30 ---
31 dir/sub | 2 ++
32 file0 | 3 +++
33 file2 | 3 ---
34 3 files changed, 5 insertions(+), 3 deletions(-)
35 delete mode 100644 file2
36
37 diff --git a/dir/sub b/dir/sub
38 index 35d242b..8422d40 100644
39 --- a/dir/sub
40 +++ b/dir/sub
41 @@ -1,2 +1,4 @@
42 A
43 B
44 +C
45 +D
46 diff --git a/file0 b/file0
47 index 01e79c3..b414108 100644
48 --- a/file0
49 +++ b/file0
50 @@ -1,3 +1,6 @@
51 1
52 2
53 3
54 +4
55 +5
56 +6
57 diff --git a/file2 b/file2
58 deleted file mode 100644
59 index 01e79c3..0000000
60 --- a/file2
61 +++ /dev/null
62 @@ -1,3 +0,0 @@
63 -1
64 -2
65 -3
66 --
67 g-i-t--v-e-r-s-i-o-n
68
69
70 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
71 From: A U Thor <author@example.com>
72 Date: Mon, 26 Jun 2006 00:02:00 +0000
73 Subject: [DIFFERENT_PREFIX 2/2] Third
74
75 ---
76 dir/sub | 2 ++
77 file1 | 3 +++
78 2 files changed, 5 insertions(+)
79 create mode 100644 file1
80
81 diff --git a/dir/sub b/dir/sub
82 index 8422d40..cead32e 100644
83 --- a/dir/sub
84 +++ b/dir/sub
85 @@ -2,3 +2,5 @@ A
86 B
87 C
88 D
89 +E
90 +F
91 diff --git a/file1 b/file1
92 new file mode 100644
93 index 0000000..b1e6722
94 --- /dev/null
95 +++ b/file1
96 @@ -0,0 +1,3 @@
97 +A
98 +B
99 +C
100 --
101 g-i-t--v-e-r-s-i-o-n
102
103 $