e9e17cdafbf67303266015f51975db2aa32f6f8b
1 $ git whatchanged --root --cc --patch-with-stat --summary master
2 commit 176b998f5d647cbd77a9d8acf4531e930754d16d
3 Merge: 889b315... c7a2ab9...
4 Author: A U Thor <author@example.com>
5 Date: Mon Jun 26 00:04:00 2006 +0000
7 Merge branch 'side'
9 dir/sub | 2 ++
10 file0 | 3 +++
11 2 files changed, 5 insertions(+), 0 deletions(-)
13 diff --cc dir/sub
14 index cead32e,7289e35..992913c
15 --- a/dir/sub
16 +++ b/dir/sub
17 @@@ -1,6 -1,4 +1,8 @@@
18 A
19 B
20 +C
21 +D
22 +E
23 +F
24 + 1
25 + 2
26 diff --cc file0
27 index b414108,f4615da..10a8a9f
28 --- a/file0
29 +++ b/file0
30 @@@ -1,6 -1,6 +1,9 @@@
31 1
32 2
33 3
34 +4
35 +5
36 +6
37 + A
38 + B
39 + C
41 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
42 Author: A U Thor <author@example.com>
43 Date: Mon Jun 26 00:03:00 2006 +0000
45 Side
46 ---
47 dir/sub | 2 ++
48 file0 | 3 +++
49 file3 | 4 ++++
50 3 files changed, 9 insertions(+), 0 deletions(-)
51 create mode 100644 file3
53 diff --git a/dir/sub b/dir/sub
54 index 35d242b..7289e35 100644
55 --- a/dir/sub
56 +++ b/dir/sub
57 @@ -1,2 +1,4 @@
58 A
59 B
60 +1
61 +2
62 diff --git a/file0 b/file0
63 index 01e79c3..f4615da 100644
64 --- a/file0
65 +++ b/file0
66 @@ -1,3 +1,6 @@
67 1
68 2
69 3
70 +A
71 +B
72 +C
73 diff --git a/file3 b/file3
74 new file mode 100644
75 index 0000000..7289e35
76 --- /dev/null
77 +++ b/file3
78 @@ -0,0 +1,4 @@
79 +A
80 +B
81 +1
82 +2
84 commit 889b315013ef9f2e2f90aa0b054b267c8a557847
85 Author: A U Thor <author@example.com>
86 Date: Mon Jun 26 00:02:00 2006 +0000
88 Third
89 ---
90 dir/sub | 2 ++
91 file1 | 3 +++
92 2 files changed, 5 insertions(+), 0 deletions(-)
93 create mode 100644 file1
95 diff --git a/dir/sub b/dir/sub
96 index 8422d40..cead32e 100644
97 --- a/dir/sub
98 +++ b/dir/sub
99 @@ -2,3 +2,5 @@ A
100 B
101 C
102 D
103 +E
104 +F
105 diff --git a/file1 b/file1
106 new file mode 100644
107 index 0000000..b1e6722
108 --- /dev/null
109 +++ b/file1
110 @@ -0,0 +1,3 @@
111 +A
112 +B
113 +C
115 commit 7952a93e09bf565b5592766a438b40cd81f4846f
116 Author: A U Thor <author@example.com>
117 Date: Mon Jun 26 00:01:00 2006 +0000
119 Second
120 ---
121 dir/sub | 2 ++
122 file0 | 3 +++
123 file2 | 3 ---
124 3 files changed, 5 insertions(+), 3 deletions(-)
125 delete mode 100644 file2
127 diff --git a/dir/sub b/dir/sub
128 index 35d242b..8422d40 100644
129 --- a/dir/sub
130 +++ b/dir/sub
131 @@ -1,2 +1,4 @@
132 A
133 B
134 +C
135 +D
136 diff --git a/file0 b/file0
137 index 01e79c3..b414108 100644
138 --- a/file0
139 +++ b/file0
140 @@ -1,3 +1,6 @@
141 1
142 2
143 3
144 +4
145 +5
146 +6
147 diff --git a/file2 b/file2
148 deleted file mode 100644
149 index 01e79c3..0000000
150 --- a/file2
151 +++ /dev/null
152 @@ -1,3 +0,0 @@
153 -1
154 -2
155 -3
157 commit 444ac553ac7612cc88969031b02b3767fb8a353a
158 Author: A U Thor <author@example.com>
159 Date: Mon Jun 26 00:00:00 2006 +0000
161 Initial
162 ---
163 dir/sub | 2 ++
164 file0 | 3 +++
165 file2 | 3 +++
166 3 files changed, 8 insertions(+), 0 deletions(-)
167 create mode 100644 dir/sub
168 create mode 100644 file0
169 create mode 100644 file2
171 diff --git a/dir/sub b/dir/sub
172 new file mode 100644
173 index 0000000..35d242b
174 --- /dev/null
175 +++ b/dir/sub
176 @@ -0,0 +1,2 @@
177 +A
178 +B
179 diff --git a/file0 b/file0
180 new file mode 100644
181 index 0000000..01e79c3
182 --- /dev/null
183 +++ b/file0
184 @@ -0,0 +1,3 @@
185 +1
186 +2
187 +3
188 diff --git a/file2 b/file2
189 new file mode 100644
190 index 0000000..01e79c3
191 --- /dev/null
192 +++ b/file2
193 @@ -0,0 +1,3 @@
194 +1
195 +2
196 +3
197 $