Commit | Line | Data |
---|---|---|
47979d5d | 1 | $ git log --root --cc --patch-with-stat --summary master |
a40d384c | 2 | commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 |
7fcda920 | 3 | Merge: 9a6d494 c7a2ab9 |
47979d5d JH |
4 | Author: A U Thor <author@example.com> |
5 | Date: Mon Jun 26 00:04:00 2006 +0000 | |
6 | ||
7 | Merge branch 'side' | |
9e76bab1 | 8 | |
47979d5d JH |
9 | dir/sub | 2 ++ |
10 | file0 | 3 +++ | |
11 | 2 files changed, 5 insertions(+), 0 deletions(-) | |
12 | ||
47979d5d JH |
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 | |
40 | ||
41 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a | |
42 | Author: A U Thor <author@example.com> | |
43 | Date: Mon Jun 26 00:03:00 2006 +0000 | |
44 | ||
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 | |
52 | ||
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 | |
83 | ||
a40d384c | 84 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 |
47979d5d JH |
85 | Author: A U Thor <author@example.com> |
86 | Date: Mon Jun 26 00:02:00 2006 +0000 | |
87 | ||
88 | Third | |
89 | --- | |
90 | dir/sub | 2 ++ | |
91 | file1 | 3 +++ | |
92 | 2 files changed, 5 insertions(+), 0 deletions(-) | |
93 | create mode 100644 file1 | |
94 | ||
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 | |
114 | ||
a40d384c | 115 | commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 |
47979d5d JH |
116 | Author: A U Thor <author@example.com> |
117 | Date: Mon Jun 26 00:01:00 2006 +0000 | |
118 | ||
119 | Second | |
a40d384c JH |
120 | |
121 | This is the second commit. | |
47979d5d JH |
122 | --- |
123 | dir/sub | 2 ++ | |
124 | file0 | 3 +++ | |
125 | file2 | 3 --- | |
126 | 3 files changed, 5 insertions(+), 3 deletions(-) | |
127 | delete mode 100644 file2 | |
128 | ||
129 | diff --git a/dir/sub b/dir/sub | |
130 | index 35d242b..8422d40 100644 | |
131 | --- a/dir/sub | |
132 | +++ b/dir/sub | |
133 | @@ -1,2 +1,4 @@ | |
134 | A | |
135 | B | |
136 | +C | |
137 | +D | |
138 | diff --git a/file0 b/file0 | |
139 | index 01e79c3..b414108 100644 | |
140 | --- a/file0 | |
141 | +++ b/file0 | |
142 | @@ -1,3 +1,6 @@ | |
143 | 1 | |
144 | 2 | |
145 | 3 | |
146 | +4 | |
147 | +5 | |
148 | +6 | |
149 | diff --git a/file2 b/file2 | |
150 | deleted file mode 100644 | |
151 | index 01e79c3..0000000 | |
152 | --- a/file2 | |
153 | +++ /dev/null | |
154 | @@ -1,3 +0,0 @@ | |
155 | -1 | |
156 | -2 | |
157 | -3 | |
158 | ||
159 | commit 444ac553ac7612cc88969031b02b3767fb8a353a | |
160 | Author: A U Thor <author@example.com> | |
161 | Date: Mon Jun 26 00:00:00 2006 +0000 | |
162 | ||
163 | Initial | |
164 | --- | |
165 | dir/sub | 2 ++ | |
166 | file0 | 3 +++ | |
167 | file2 | 3 +++ | |
168 | 3 files changed, 8 insertions(+), 0 deletions(-) | |
169 | create mode 100644 dir/sub | |
170 | create mode 100644 file0 | |
171 | create mode 100644 file2 | |
172 | ||
173 | diff --git a/dir/sub b/dir/sub | |
174 | new file mode 100644 | |
175 | index 0000000..35d242b | |
176 | --- /dev/null | |
177 | +++ b/dir/sub | |
178 | @@ -0,0 +1,2 @@ | |
179 | +A | |
180 | +B | |
181 | diff --git a/file0 b/file0 | |
182 | new file mode 100644 | |
183 | index 0000000..01e79c3 | |
184 | --- /dev/null | |
185 | +++ b/file0 | |
186 | @@ -0,0 +1,3 @@ | |
187 | +1 | |
188 | +2 | |
189 | +3 | |
190 | diff --git a/file2 b/file2 | |
191 | new file mode 100644 | |
192 | index 0000000..01e79c3 | |
193 | --- /dev/null | |
194 | +++ b/file2 | |
195 | @@ -0,0 +1,3 @@ | |
196 | +1 | |
197 | +2 | |
198 | +3 | |
199 | $ |