Code

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