Git fork
at reftables-rust 93 lines 1.3 kB view raw
1$ git show -m main 2commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) 3Merge: 9a6d494 c7a2ab9 4Author: A U Thor <author@example.com> 5Date: Mon Jun 26 00:04:00 2006 +0000 6 7 Merge branch 'side' 8 9diff --git a/dir/sub b/dir/sub 10index cead32e..992913c 100644 11--- a/dir/sub 12+++ b/dir/sub 13@@ -4,3 +4,5 @@ C 14 D 15 E 16 F 17+1 18+2 19diff --git a/file0 b/file0 20index b414108..10a8a9f 100644 21--- a/file0 22+++ b/file0 23@@ -4,3 +4,6 @@ 24 4 25 5 26 6 27+A 28+B 29+C 30 31commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) 32Merge: 9a6d494 c7a2ab9 33Author: A U Thor <author@example.com> 34Date: Mon Jun 26 00:04:00 2006 +0000 35 36 Merge branch 'side' 37 38diff --git a/dir/sub b/dir/sub 39index 7289e35..992913c 100644 40--- a/dir/sub 41+++ b/dir/sub 42@@ -1,4 +1,8 @@ 43 A 44 B 45+C 46+D 47+E 48+F 49 1 50 2 51diff --git a/file0 b/file0 52index f4615da..10a8a9f 100644 53--- a/file0 54+++ b/file0 55@@ -1,6 +1,9 @@ 56 1 57 2 58 3 59+4 60+5 61+6 62 A 63 B 64 C 65diff --git a/file1 b/file1 66new file mode 100644 67index 0000000..b1e6722 68--- /dev/null 69+++ b/file1 70@@ -0,0 +1,3 @@ 71+A 72+B 73+C 74diff --git a/file2 b/file2 75deleted file mode 100644 76index 01e79c3..0000000 77--- a/file2 78+++ /dev/null 79@@ -1,3 +0,0 @@ 80-1 81-2 82-3 83diff --git a/file3 b/file3 84deleted file mode 100644 85index 7289e35..0000000 86--- a/file3 87+++ /dev/null 88@@ -1,4 +0,0 @@ 89-A 90-B 91-1 92-2 93$