]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.format-patch_--stdout_initial..master
Merge branch 'jc/diff-test' into jc/diff-test-updates
[thirdparty/git.git] / t / t4013 / diff.format-patch_--stdout_initial..master
1 $ git format-patch --stdout initial..master
2 From 7952a93e09bf565b5592766a438b40cd81f4846f Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:01:00 +0000
5 Subject: [PATCH] Second
6 ---
7 dir/sub | 2 ++
8 file0 | 3 +++
9 file2 | 3 ---
10 3 files changed, 5 insertions(+), 3 deletions(-)
11
12 diff --git a/dir/sub b/dir/sub
13 index 35d242b..8422d40 100644
14 --- a/dir/sub
15 +++ b/dir/sub
16 @@ -1,2 +1,4 @@
17 A
18 B
19 +C
20 +D
21 diff --git a/file0 b/file0
22 index 01e79c3..b414108 100644
23 --- a/file0
24 +++ b/file0
25 @@ -1,3 +1,6 @@
26 1
27 2
28 3
29 +4
30 +5
31 +6
32 diff --git a/file2 b/file2
33 deleted file mode 100644
34 index 01e79c3..0000000
35 --- a/file2
36 +++ /dev/null
37 @@ -1,3 +0,0 @@
38 -1
39 -2
40 -3
41 --
42 g-i-t--v-e-r-s-i-o-n
43
44
45 From 889b315013ef9f2e2f90aa0b054b267c8a557847 Mon Sep 17 00:00:00 2001
46 From: A U Thor <author@example.com>
47 Date: Mon, 26 Jun 2006 00:02:00 +0000
48 Subject: [PATCH] Third
49 ---
50 dir/sub | 2 ++
51 file1 | 3 +++
52 2 files changed, 5 insertions(+), 0 deletions(-)
53
54 diff --git a/dir/sub b/dir/sub
55 index 8422d40..cead32e 100644
56 --- a/dir/sub
57 +++ b/dir/sub
58 @@ -2,3 +2,5 @@ A
59 B
60 C
61 D
62 +E
63 +F
64 diff --git a/file1 b/file1
65 new file mode 100644
66 index 0000000..b1e6722
67 --- /dev/null
68 +++ b/file1
69 @@ -0,0 +1,3 @@
70 +A
71 +B
72 +C
73 --
74 g-i-t--v-e-r-s-i-o-n
75
76
77 From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
78 From: A U Thor <author@example.com>
79 Date: Mon, 26 Jun 2006 00:03:00 +0000
80 Subject: [PATCH] Side
81 ---
82 dir/sub | 2 ++
83 file0 | 3 +++
84 file3 | 4 ++++
85 3 files changed, 9 insertions(+), 0 deletions(-)
86
87 diff --git a/dir/sub b/dir/sub
88 index 35d242b..7289e35 100644
89 --- a/dir/sub
90 +++ b/dir/sub
91 @@ -1,2 +1,4 @@
92 A
93 B
94 +1
95 +2
96 diff --git a/file0 b/file0
97 index 01e79c3..f4615da 100644
98 --- a/file0
99 +++ b/file0
100 @@ -1,3 +1,6 @@
101 1
102 2
103 3
104 +A
105 +B
106 +C
107 diff --git a/file3 b/file3
108 new file mode 100644
109 index 0000000..7289e35
110 --- /dev/null
111 +++ b/file3
112 @@ -0,0 +1,4 @@
113 +A
114 +B
115 +1
116 +2
117 --
118 g-i-t--v-e-r-s-i-o-n
119
120 $