]> git.ipfire.org Git - thirdparty/git.git/blame - t/t4013/diff.format-patch_--inline_--stdout_--numbered-files_initial..master
diff --stat: use less columns for change counts
[thirdparty/git.git] / t / t4013 / diff.format-patch_--inline_--stdout_--numbered-files_initial..master
CommitLineData
747e2505
SB
1$ git format-patch --inline --stdout --numbered-files initial..master
2From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
3From: A U Thor <author@example.com>
4Date: Mon, 26 Jun 2006 00:01:00 +0000
5Subject: [PATCH 1/3] Second
6MIME-Version: 1.0
7Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
8
9This is a multi-part message in MIME format.
10--------------g-i-t--v-e-r-s-i-o-n
11Content-Type: text/plain; charset=UTF-8; format=fixed
12Content-Transfer-Encoding: 8bit
13
14
15This is the second commit.
16---
dc801e71
ZJS
17 dir/sub | 2 ++
18 file0 | 3 +++
19 file2 | 3 ---
747e2505
SB
20 3 files changed, 5 insertions(+), 3 deletions(-)
21 delete mode 100644 file2
22
23
24--------------g-i-t--v-e-r-s-i-o-n
25Content-Type: text/x-patch; name="1"
26Content-Transfer-Encoding: 8bit
27Content-Disposition: inline; filename="1"
28
29diff --git a/dir/sub b/dir/sub
30index 35d242b..8422d40 100644
31--- a/dir/sub
32+++ b/dir/sub
33@@ -1,2 +1,4 @@
34 A
35 B
36+C
37+D
38diff --git a/file0 b/file0
39index 01e79c3..b414108 100644
40--- a/file0
41+++ b/file0
42@@ -1,3 +1,6 @@
43 1
44 2
45 3
46+4
47+5
48+6
49diff --git a/file2 b/file2
50deleted file mode 100644
51index 01e79c3..0000000
52--- a/file2
53+++ /dev/null
54@@ -1,3 +0,0 @@
55-1
56-2
57-3
58
59--------------g-i-t--v-e-r-s-i-o-n--
60
61
62
63From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
64From: A U Thor <author@example.com>
65Date: Mon, 26 Jun 2006 00:02:00 +0000
66Subject: [PATCH 2/3] Third
67MIME-Version: 1.0
68Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
69
70This is a multi-part message in MIME format.
71--------------g-i-t--v-e-r-s-i-o-n
72Content-Type: text/plain; charset=UTF-8; format=fixed
73Content-Transfer-Encoding: 8bit
74
75---
dc801e71
ZJS
76 dir/sub | 2 ++
77 file1 | 3 +++
7f814632 78 2 files changed, 5 insertions(+)
747e2505
SB
79 create mode 100644 file1
80
81
82--------------g-i-t--v-e-r-s-i-o-n
83Content-Type: text/x-patch; name="2"
84Content-Transfer-Encoding: 8bit
85Content-Disposition: inline; filename="2"
86
87diff --git a/dir/sub b/dir/sub
88index 8422d40..cead32e 100644
89--- a/dir/sub
90+++ b/dir/sub
91@@ -2,3 +2,5 @@ A
92 B
93 C
94 D
95+E
96+F
97diff --git a/file1 b/file1
98new file mode 100644
99index 0000000..b1e6722
100--- /dev/null
101+++ b/file1
102@@ -0,0 +1,3 @@
103+A
104+B
105+C
106
107--------------g-i-t--v-e-r-s-i-o-n--
108
109
110
111From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
112From: A U Thor <author@example.com>
113Date: Mon, 26 Jun 2006 00:03:00 +0000
114Subject: [PATCH 3/3] Side
115MIME-Version: 1.0
116Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
117
118This is a multi-part message in MIME format.
119--------------g-i-t--v-e-r-s-i-o-n
120Content-Type: text/plain; charset=UTF-8; format=fixed
121Content-Transfer-Encoding: 8bit
122
123---
dc801e71
ZJS
124 dir/sub | 2 ++
125 file0 | 3 +++
126 file3 | 4 ++++
7f814632 127 3 files changed, 9 insertions(+)
747e2505
SB
128 create mode 100644 file3
129
130
131--------------g-i-t--v-e-r-s-i-o-n
132Content-Type: text/x-patch; name="3"
133Content-Transfer-Encoding: 8bit
134Content-Disposition: inline; filename="3"
135
136diff --git a/dir/sub b/dir/sub
137index 35d242b..7289e35 100644
138--- a/dir/sub
139+++ b/dir/sub
140@@ -1,2 +1,4 @@
141 A
142 B
143+1
144+2
145diff --git a/file0 b/file0
146index 01e79c3..f4615da 100644
147--- a/file0
148+++ b/file0
149@@ -1,3 +1,6 @@
150 1
151 2
152 3
153+A
154+B
155+C
156diff --git a/file3 b/file3
157new file mode 100644
158index 0000000..7289e35
159--- /dev/null
160+++ b/file3
161@@ -0,0 +1,4 @@
162+A
163+B
164+1
165+2
166
167--------------g-i-t--v-e-r-s-i-o-n--
168
169
170$