]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4013/diff.whatchanged_--patch-with-stat_master
Merge branch 'lt/merge-tree'
[thirdparty/git.git] / t / t4013 / diff.whatchanged_--patch-with-stat_master
1 $ git whatchanged --patch-with-stat master
2 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
3 Author: A U Thor <author@example.com>
4 Date: Mon Jun 26 00:03:00 2006 +0000
5
6 Side
7 ---
8 dir/sub | 2 ++
9 file0 | 3 +++
10 file3 | 4 ++++
11 3 files changed, 9 insertions(+), 0 deletions(-)
12
13 diff --git a/dir/sub b/dir/sub
14 index 35d242b..7289e35 100644
15 --- a/dir/sub
16 +++ b/dir/sub
17 @@ -1,2 +1,4 @@
18 A
19 B
20 +1
21 +2
22 diff --git a/file0 b/file0
23 index 01e79c3..f4615da 100644
24 --- a/file0
25 +++ b/file0
26 @@ -1,3 +1,6 @@
27 1
28 2
29 3
30 +A
31 +B
32 +C
33 diff --git a/file3 b/file3
34 new file mode 100644
35 index 0000000..7289e35
36 --- /dev/null
37 +++ b/file3
38 @@ -0,0 +1,4 @@
39 +A
40 +B
41 +1
42 +2
43
44 commit 889b315013ef9f2e2f90aa0b054b267c8a557847
45 Author: A U Thor <author@example.com>
46 Date: Mon Jun 26 00:02:00 2006 +0000
47
48 Third
49 ---
50 dir/sub | 2 ++
51 file1 | 3 +++
52 2 files changed, 5 insertions(+), 0 deletions(-)
53
54 diff --git a/dir/sub b/dir/sub
55 index 8422d40..cead32e 100644
56 --- a/dir/sub
57 +++ b/dir/sub
58 @@ -2,3 +2,5 @@ A
59 B
60 C
61 D
62 +E
63 +F
64 diff --git a/file1 b/file1
65 new file mode 100644
66 index 0000000..b1e6722
67 --- /dev/null
68 +++ b/file1
69 @@ -0,0 +1,3 @@
70 +A
71 +B
72 +C
73
74 commit 7952a93e09bf565b5592766a438b40cd81f4846f
75 Author: A U Thor <author@example.com>
76 Date: Mon Jun 26 00:01:00 2006 +0000
77
78 Second
79 ---
80 dir/sub | 2 ++
81 file0 | 3 +++
82 file2 | 3 ---
83 3 files changed, 5 insertions(+), 3 deletions(-)
84
85 diff --git a/dir/sub b/dir/sub
86 index 35d242b..8422d40 100644
87 --- a/dir/sub
88 +++ b/dir/sub
89 @@ -1,2 +1,4 @@
90 A
91 B
92 +C
93 +D
94 diff --git a/file0 b/file0
95 index 01e79c3..b414108 100644
96 --- a/file0
97 +++ b/file0
98 @@ -1,3 +1,6 @@
99 1
100 2
101 3
102 +4
103 +5
104 +6
105 diff --git a/file2 b/file2
106 deleted file mode 100644
107 index 01e79c3..0000000
108 --- a/file2
109 +++ /dev/null
110 @@ -1,3 +0,0 @@
111 -1
112 -2
113 -3
114 $