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