blob: 1c3cde251b53cc8dfe476210411d22d61f24d473 [file] [log] [blame]
Junio C Hamanod410e432006-06-29 00:01:07 -07001$ git format-patch --attach --stdout initial..master^
Junio C Hamanoa40d3842006-07-13 19:51:12 -07002From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
Junio C Hamanod410e432006-06-29 00:01:07 -07003From: A U Thor <author@example.com>
4Date: Mon, 26 Jun 2006 00:01:00 +0000
Brian Gernhardta567fdc2008-10-02 16:55:39 -04005Subject: [PATCH 1/2] Second
Junio C Hamanod410e432006-06-29 00:01:07 -07006MIME-Version: 1.0
Junio C Hamano33ee4cf2007-03-04 16:08:04 -08007Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
Junio C Hamanod410e432006-06-29 00:01:07 -07008
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
Junio C Hamanoa40d3842006-07-13 19:51:12 -070013
14
15This is the second commit.
Junio C Hamanod410e432006-06-29 00:01:07 -070016---
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +020017 dir/sub | 2 ++
18 file0 | 3 +++
19 file2 | 3 ---
Junio C Hamanod410e432006-06-29 00:01:07 -070020 3 files changed, 5 insertions(+), 3 deletions(-)
Junio C Hamanoc261e432007-01-17 13:51:44 -080021 delete mode 100644 file2
Kevin Ballard6b2fbaa2008-07-29 22:49:33 -070022
23
Junio C Hamanod410e432006-06-29 00:01:07 -070024--------------g-i-t--v-e-r-s-i-o-n
Stephen Boyd108dab22009-03-22 19:14:05 -070025Content-Type: text/x-patch; name="0001-Second.patch"
Junio C Hamanod410e432006-06-29 00:01:07 -070026Content-Transfer-Encoding: 8bit
Stephen Boyd108dab22009-03-22 19:14:05 -070027Content-Disposition: attachment; filename="0001-Second.patch"
Junio C Hamanod410e432006-06-29 00:01:07 -070028
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
Junio C Hamanoa40d3842006-07-13 19:51:12 -070063From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
Junio C Hamanod410e432006-06-29 00:01:07 -070064From: A U Thor <author@example.com>
65Date: Mon, 26 Jun 2006 00:02:00 +0000
Brian Gernhardta567fdc2008-10-02 16:55:39 -040066Subject: [PATCH 2/2] Third
Junio C Hamanod410e432006-06-29 00:01:07 -070067MIME-Version: 1.0
Junio C Hamano33ee4cf2007-03-04 16:08:04 -080068Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
Junio C Hamanod410e432006-06-29 00:01:07 -070069
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
Junio C Hamano85540922006-07-13 21:39:13 -070074
Junio C Hamanod410e432006-06-29 00:01:07 -070075---
Zbigniew Jędrzejewski-Szmekdc801e72012-04-30 22:38:58 +020076 dir/sub | 2 ++
77 file1 | 3 +++
Nguyễn Thái Ngọc Duy7f814632012-02-01 19:55:07 +070078 2 files changed, 5 insertions(+)
Junio C Hamanoc261e432007-01-17 13:51:44 -080079 create mode 100644 file1
Kevin Ballard6b2fbaa2008-07-29 22:49:33 -070080
81
Junio C Hamanod410e432006-06-29 00:01:07 -070082--------------g-i-t--v-e-r-s-i-o-n
Stephen Boyd108dab22009-03-22 19:14:05 -070083Content-Type: text/x-patch; name="0002-Third.patch"
Junio C Hamanod410e432006-06-29 00:01:07 -070084Content-Transfer-Encoding: 8bit
Stephen Boyd108dab22009-03-22 19:14:05 -070085Content-Disposition: attachment; filename="0002-Third.patch"
Junio C Hamanod410e432006-06-29 00:01:07 -070086
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$