Commit | Line | Data |
---|---|---|
47979d5d | 1 | $ git log --root --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' | |
8 | ||
9 | commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a | |
10 | Author: A U Thor <author@example.com> | |
11 | Date: Mon Jun 26 00:03:00 2006 +0000 | |
12 | ||
13 | Side | |
14 | --- | |
dc801e71 ZJS |
15 | dir/sub | 2 ++ |
16 | file0 | 3 +++ | |
17 | file3 | 4 ++++ | |
7f814632 | 18 | 3 files changed, 9 insertions(+) |
47979d5d JH |
19 | create mode 100644 file3 |
20 | ||
21 | diff --git a/dir/sub b/dir/sub | |
22 | index 35d242b..7289e35 100644 | |
23 | --- a/dir/sub | |
24 | +++ b/dir/sub | |
25 | @@ -1,2 +1,4 @@ | |
26 | A | |
27 | B | |
28 | +1 | |
29 | +2 | |
30 | diff --git a/file0 b/file0 | |
31 | index 01e79c3..f4615da 100644 | |
32 | --- a/file0 | |
33 | +++ b/file0 | |
34 | @@ -1,3 +1,6 @@ | |
35 | 1 | |
36 | 2 | |
37 | 3 | |
38 | +A | |
39 | +B | |
40 | +C | |
41 | diff --git a/file3 b/file3 | |
42 | new file mode 100644 | |
43 | index 0000000..7289e35 | |
44 | --- /dev/null | |
45 | +++ b/file3 | |
46 | @@ -0,0 +1,4 @@ | |
47 | +A | |
48 | +B | |
49 | +1 | |
50 | +2 | |
51 | ||
a40d384c | 52 | commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 |
47979d5d JH |
53 | Author: A U Thor <author@example.com> |
54 | Date: Mon Jun 26 00:02:00 2006 +0000 | |
55 | ||
56 | Third | |
57 | --- | |
dc801e71 ZJS |
58 | dir/sub | 2 ++ |
59 | file1 | 3 +++ | |
7f814632 | 60 | 2 files changed, 5 insertions(+) |
47979d5d JH |
61 | create mode 100644 file1 |
62 | ||
63 | diff --git a/dir/sub b/dir/sub | |
64 | index 8422d40..cead32e 100644 | |
65 | --- a/dir/sub | |
66 | +++ b/dir/sub | |
67 | @@ -2,3 +2,5 @@ A | |
68 | B | |
69 | C | |
70 | D | |
71 | +E | |
72 | +F | |
73 | diff --git a/file1 b/file1 | |
74 | new file mode 100644 | |
75 | index 0000000..b1e6722 | |
76 | --- /dev/null | |
77 | +++ b/file1 | |
78 | @@ -0,0 +1,3 @@ | |
79 | +A | |
80 | +B | |
81 | +C | |
82 | ||
a40d384c | 83 | commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 |
47979d5d JH |
84 | Author: A U Thor <author@example.com> |
85 | Date: Mon Jun 26 00:01:00 2006 +0000 | |
86 | ||
87 | Second | |
a40d384c JH |
88 | |
89 | This is the second commit. | |
47979d5d | 90 | --- |
dc801e71 ZJS |
91 | dir/sub | 2 ++ |
92 | file0 | 3 +++ | |
93 | file2 | 3 --- | |
47979d5d JH |
94 | 3 files changed, 5 insertions(+), 3 deletions(-) |
95 | delete mode 100644 file2 | |
96 | ||
97 | diff --git a/dir/sub b/dir/sub | |
98 | index 35d242b..8422d40 100644 | |
99 | --- a/dir/sub | |
100 | +++ b/dir/sub | |
101 | @@ -1,2 +1,4 @@ | |
102 | A | |
103 | B | |
104 | +C | |
105 | +D | |
106 | diff --git a/file0 b/file0 | |
107 | index 01e79c3..b414108 100644 | |
108 | --- a/file0 | |
109 | +++ b/file0 | |
110 | @@ -1,3 +1,6 @@ | |
111 | 1 | |
112 | 2 | |
113 | 3 | |
114 | +4 | |
115 | +5 | |
116 | +6 | |
117 | diff --git a/file2 b/file2 | |
118 | deleted file mode 100644 | |
119 | index 01e79c3..0000000 | |
120 | --- a/file2 | |
121 | +++ /dev/null | |
122 | @@ -1,3 +0,0 @@ | |
123 | -1 | |
124 | -2 | |
125 | -3 | |
126 | ||
127 | commit 444ac553ac7612cc88969031b02b3767fb8a353a | |
128 | Author: A U Thor <author@example.com> | |
129 | Date: Mon Jun 26 00:00:00 2006 +0000 | |
130 | ||
131 | Initial | |
132 | --- | |
dc801e71 ZJS |
133 | dir/sub | 2 ++ |
134 | file0 | 3 +++ | |
135 | file2 | 3 +++ | |
7f814632 | 136 | 3 files changed, 8 insertions(+) |
47979d5d JH |
137 | create mode 100644 dir/sub |
138 | create mode 100644 file0 | |
139 | create mode 100644 file2 | |
140 | ||
141 | diff --git a/dir/sub b/dir/sub | |
142 | new file mode 100644 | |
143 | index 0000000..35d242b | |
144 | --- /dev/null | |
145 | +++ b/dir/sub | |
146 | @@ -0,0 +1,2 @@ | |
147 | +A | |
148 | +B | |
149 | diff --git a/file0 b/file0 | |
150 | new file mode 100644 | |
151 | index 0000000..01e79c3 | |
152 | --- /dev/null | |
153 | +++ b/file0 | |
154 | @@ -0,0 +1,3 @@ | |
155 | +1 | |
156 | +2 | |
157 | +3 | |
158 | diff --git a/file2 b/file2 | |
159 | new file mode 100644 | |
160 | index 0000000..01e79c3 | |
161 | --- /dev/null | |
162 | +++ b/file2 | |
163 | @@ -0,0 +1,3 @@ | |
164 | +1 | |
165 | +2 | |
166 | +3 | |
167 | $ |