]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.format-patch_--stdout_initial..master^
Merge branch 'bc/sha-256-part-2'
[thirdparty/git.git] / t / t4013 / diff.format-patch_--stdout_initial..master^
1 $ git format-patch --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: [PATCH 1/2] Second
6
7 This is the second commit.
8 ---
9 dir/sub | 2 ++
10 file0 | 3 +++
11 file2 | 3 ---
12 3 files changed, 5 insertions(+), 3 deletions(-)
13 delete mode 100644 file2
14
15 diff --git a/dir/sub b/dir/sub
16 index 35d242b..8422d40 100644
17 --- a/dir/sub
18 +++ b/dir/sub
19 @@ -1,2 +1,4 @@
20 A
21 B
22 +C
23 +D
24 diff --git a/file0 b/file0
25 index 01e79c3..b414108 100644
26 --- a/file0
27 +++ b/file0
28 @@ -1,3 +1,6 @@
29 1
30 2
31 3
32 +4
33 +5
34 +6
35 diff --git a/file2 b/file2
36 deleted file mode 100644
37 index 01e79c3..0000000
38 --- a/file2
39 +++ /dev/null
40 @@ -1,3 +0,0 @@
41 -1
42 -2
43 -3
44 --
45 g-i-t--v-e-r-s-i-o-n
46
47
48 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
49 From: A U Thor <author@example.com>
50 Date: Mon, 26 Jun 2006 00:02:00 +0000
51 Subject: [PATCH 2/2] Third
52
53 ---
54 dir/sub | 2 ++
55 file1 | 3 +++
56 2 files changed, 5 insertions(+)
57 create mode 100644 file1
58
59 diff --git a/dir/sub b/dir/sub
60 index 8422d40..cead32e 100644
61 --- a/dir/sub
62 +++ b/dir/sub
63 @@ -2,3 +2,5 @@ A
64 B
65 C
66 D
67 +E
68 +F
69 diff --git a/file1 b/file1
70 new file mode 100644
71 index 0000000..b1e6722
72 --- /dev/null
73 +++ b/file1
74 @@ -0,0 +1,3 @@
75 +A
76 +B
77 +C
78 --
79 g-i-t--v-e-r-s-i-o-n
80
81 $