summaryrefslogtreecommitdiff
path: root/t/t4013/diff.format-patch_--attach_--stdout_--suffix=.diff_initial..side
blob: 547ca065a59cd7ed4cb74dffe570db81e9fd9c0e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
$ git format-patch --attach --stdout --suffix=.diff initial..side
From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
From: A U Thor <author@example.com>
Date: Mon, 26 Jun 2006 00:03:00 +0000
Subject: [PATCH] Side
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"

This is a multi-part message in MIME format.
--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/plain; charset=UTF-8; format=fixed
Content-Transfer-Encoding: 8bit

---
 dir/sub | 2 ++
 file0   | 3 +++
 file3   | 4 ++++
 3 files changed, 9 insertions(+)
 create mode 100644 file3


--------------g-i-t--v-e-r-s-i-o-n
Content-Type: text/x-patch; name="0001-Side.diff"
Content-Transfer-Encoding: 8bit
Content-Disposition: attachment; filename="0001-Side.diff"

diff --git a/dir/sub b/dir/sub
index 35d242b..7289e35 100644
--- a/dir/sub
+++ b/dir/sub
@@ -1,2 +1,4 @@
 A
 B
+1
+2
diff --git a/file0 b/file0
index 01e79c3..f4615da 100644
--- a/file0
+++ b/file0
@@ -1,3 +1,6 @@
 1
 2
 3
+A
+B
+C
diff --git a/file3 b/file3
new file mode 100644
index 0000000..7289e35
--- /dev/null
+++ b/file3
@@ -0,0 +1,4 @@
+A
+B
+1
+2

--------------g-i-t--v-e-r-s-i-o-n--


$