You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
198 lines
3.0 KiB
198 lines
3.0 KiB
$ git log --root -c --patch-with-stat --summary master |
|
commit 176b998f5d647cbd77a9d8acf4531e930754d16d |
|
Merge: 889b315... c7a2ab9... |
|
Author: A U Thor <author@example.com> |
|
Date: Mon Jun 26 00:04:00 2006 +0000 |
|
|
|
Merge branch 'side' |
|
--- |
|
dir/sub | 2 ++ |
|
file0 | 3 +++ |
|
2 files changed, 5 insertions(+), 0 deletions(-) |
|
|
|
|
|
diff --combined dir/sub |
|
index cead32e,7289e35..992913c |
|
--- a/dir/sub |
|
+++ b/dir/sub |
|
@@@ -1,6 -1,4 +1,8 @@@ |
|
A |
|
B |
|
+C |
|
+D |
|
+E |
|
+F |
|
+ 1 |
|
+ 2 |
|
diff --combined file0 |
|
index b414108,f4615da..10a8a9f |
|
--- a/file0 |
|
+++ b/file0 |
|
@@@ -1,6 -1,6 +1,9 @@@ |
|
1 |
|
2 |
|
3 |
|
+4 |
|
+5 |
|
+6 |
|
+ A |
|
+ B |
|
+ C |
|
|
|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a |
|
Author: A U Thor <author@example.com> |
|
Date: Mon Jun 26 00:03:00 2006 +0000 |
|
|
|
Side |
|
--- |
|
dir/sub | 2 ++ |
|
file0 | 3 +++ |
|
file3 | 4 ++++ |
|
3 files changed, 9 insertions(+), 0 deletions(-) |
|
create mode 100644 file3 |
|
|
|
diff --git a/dir/sub b/dir/sub |
|
index 35d242b..7289e35 100644 |
|
--- a/dir/sub |
|
+++ b/dir/sub |
|
@@ -1,2 +1,4 @@ |
|
A |
|
B |
|
+1 |
|
+2 |
|
diff --git a/file0 b/file0 |
|
index 01e79c3..f4615da 100644 |
|
--- a/file0 |
|
+++ b/file0 |
|
@@ -1,3 +1,6 @@ |
|
1 |
|
2 |
|
3 |
|
+A |
|
+B |
|
+C |
|
diff --git a/file3 b/file3 |
|
new file mode 100644 |
|
index 0000000..7289e35 |
|
--- /dev/null |
|
+++ b/file3 |
|
@@ -0,0 +1,4 @@ |
|
+A |
|
+B |
|
+1 |
|
+2 |
|
|
|
commit 889b315013ef9f2e2f90aa0b054b267c8a557847 |
|
Author: A U Thor <author@example.com> |
|
Date: Mon Jun 26 00:02:00 2006 +0000 |
|
|
|
Third |
|
--- |
|
dir/sub | 2 ++ |
|
file1 | 3 +++ |
|
2 files changed, 5 insertions(+), 0 deletions(-) |
|
create mode 100644 file1 |
|
|
|
diff --git a/dir/sub b/dir/sub |
|
index 8422d40..cead32e 100644 |
|
--- a/dir/sub |
|
+++ b/dir/sub |
|
@@ -2,3 +2,5 @@ A |
|
B |
|
C |
|
D |
|
+E |
|
+F |
|
diff --git a/file1 b/file1 |
|
new file mode 100644 |
|
index 0000000..b1e6722 |
|
--- /dev/null |
|
+++ b/file1 |
|
@@ -0,0 +1,3 @@ |
|
+A |
|
+B |
|
+C |
|
|
|
commit 7952a93e09bf565b5592766a438b40cd81f4846f |
|
Author: A U Thor <author@example.com> |
|
Date: Mon Jun 26 00:01:00 2006 +0000 |
|
|
|
Second |
|
--- |
|
dir/sub | 2 ++ |
|
file0 | 3 +++ |
|
file2 | 3 --- |
|
3 files changed, 5 insertions(+), 3 deletions(-) |
|
delete mode 100644 file2 |
|
|
|
diff --git a/dir/sub b/dir/sub |
|
index 35d242b..8422d40 100644 |
|
--- a/dir/sub |
|
+++ b/dir/sub |
|
@@ -1,2 +1,4 @@ |
|
A |
|
B |
|
+C |
|
+D |
|
diff --git a/file0 b/file0 |
|
index 01e79c3..b414108 100644 |
|
--- a/file0 |
|
+++ b/file0 |
|
@@ -1,3 +1,6 @@ |
|
1 |
|
2 |
|
3 |
|
+4 |
|
+5 |
|
+6 |
|
diff --git a/file2 b/file2 |
|
deleted file mode 100644 |
|
index 01e79c3..0000000 |
|
--- a/file2 |
|
+++ /dev/null |
|
@@ -1,3 +0,0 @@ |
|
-1 |
|
-2 |
|
-3 |
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a |
|
Author: A U Thor <author@example.com> |
|
Date: Mon Jun 26 00:00:00 2006 +0000 |
|
|
|
Initial |
|
--- |
|
dir/sub | 2 ++ |
|
file0 | 3 +++ |
|
file2 | 3 +++ |
|
3 files changed, 8 insertions(+), 0 deletions(-) |
|
create mode 100644 dir/sub |
|
create mode 100644 file0 |
|
create mode 100644 file2 |
|
|
|
diff --git a/dir/sub b/dir/sub |
|
new file mode 100644 |
|
index 0000000..35d242b |
|
--- /dev/null |
|
+++ b/dir/sub |
|
@@ -0,0 +1,2 @@ |
|
+A |
|
+B |
|
diff --git a/file0 b/file0 |
|
new file mode 100644 |
|
index 0000000..01e79c3 |
|
--- /dev/null |
|
+++ b/file0 |
|
@@ -0,0 +1,3 @@ |
|
+1 |
|
+2 |
|
+3 |
|
diff --git a/file2 b/file2 |
|
new file mode 100644 |
|
index 0000000..01e79c3 |
|
--- /dev/null |
|
+++ b/file2 |
|
@@ -0,0 +1,3 @@ |
|
+1 |
|
+2 |
|
+3 |
|
$
|
|
|