Code

Merge branch 'jc/diff-test' into jc/diff-test-updates
[git.git] / t / t4013 / diff.format-patch_--attach_--stdout_initial..side
1 $ git format-patch --attach --stdout initial..side
2 From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001
3 From: A U Thor <author@example.com>
4 Date: Mon, 26 Jun 2006 00:03:00 +0000
5 Subject: [PATCH] Side
6 MIME-Version: 1.0
7 Content-Type: multipart/mixed;
8  boundary="------------g-i-t--v-e-r-s-i-o-n"
10 This is a multi-part message in MIME format.
11 --------------g-i-t--v-e-r-s-i-o-n
12 Content-Type: text/plain; charset=UTF-8; format=fixed
13 Content-Transfer-Encoding: 8bit
14 ---
15  dir/sub |    2 ++
16  file0   |    3 +++
17  file3   |    4 ++++
18  3 files changed, 9 insertions(+), 0 deletions(-)
19 --------------g-i-t--v-e-r-s-i-o-n
20 Content-Type: text/x-patch;
21  name="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
22 Content-Transfer-Encoding: 8bit
23 Content-Disposition: inline;
24  filename="c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a.diff"
26 diff --git a/dir/sub b/dir/sub
27 index 35d242b..7289e35 100644
28 --- a/dir/sub
29 +++ b/dir/sub
30 @@ -1,2 +1,4 @@
31  A
32  B
33 +1
34 +2
35 diff --git a/file0 b/file0
36 index 01e79c3..f4615da 100644
37 --- a/file0
38 +++ b/file0
39 @@ -1,3 +1,6 @@
40  1
41  2
42  3
43 +A
44 +B
45 +C
46 diff --git a/file3 b/file3
47 new file mode 100644
48 index 0000000..7289e35
49 --- /dev/null
50 +++ b/file3
51 @@ -0,0 +1,4 @@
52 +A
53 +B
54 +1
55 +2
57 --------------g-i-t--v-e-r-s-i-o-n--
60 $