]> git.ipfire.org Git - thirdparty/git.git/blame - t/t4013/diff.format-patch_--inline_--stdout_initial..master^
diff --stat: use less columns for change counts
[thirdparty/git.git] / t / t4013 / diff.format-patch_--inline_--stdout_initial..master^
CommitLineData
c112f689
JS
1$ git format-patch --inline --stdout 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
a567fdcb 5Subject: [PATCH 1/2] Second
c112f689 6MIME-Version: 1.0
33ee4cfb 7Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
c112f689
JS
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 ---
c112f689
JS
20 3 files changed, 5 insertions(+), 3 deletions(-)
21 delete mode 100644 file2
6b2fbaaf
KB
22
23
c112f689 24--------------g-i-t--v-e-r-s-i-o-n
108dab28 25Content-Type: text/x-patch; name="0001-Second.patch"
c112f689 26Content-Transfer-Encoding: 8bit
108dab28 27Content-Disposition: inline; filename="0001-Second.patch"
c112f689
JS
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
a567fdcb 66Subject: [PATCH 2/2] Third
c112f689 67MIME-Version: 1.0
33ee4cfb 68Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
c112f689
JS
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(+)
c112f689 79 create mode 100644 file1
6b2fbaaf
KB
80
81
c112f689 82--------------g-i-t--v-e-r-s-i-o-n
108dab28 83Content-Type: text/x-patch; name="0002-Third.patch"
c112f689 84Content-Transfer-Encoding: 8bit
108dab28 85Content-Disposition: inline; filename="0002-Third.patch"
c112f689
JS
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$