git

1
$ git log --root -p master
2
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
3
Merge: 9a6d494 c7a2ab9
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

15
diff --git a/dir/sub b/dir/sub
16
index 35d242b..7289e35 100644
17
--- a/dir/sub
18
+++ b/dir/sub
19
@@ -1,2 +1,4 @@
20
 A
21
 B
22
+1
23
+2
24
diff --git a/file0 b/file0
25
index 01e79c3..f4615da 100644
26
--- a/file0
27
+++ b/file0
28
@@ -1,3 +1,6 @@
29
 1
30
 2
31
 3
32
+A
33
+B
34
+C
35
diff --git a/file3 b/file3
36
new file mode 100644
37
index 0000000..7289e35
38
--- /dev/null
39
+++ b/file3
40
@@ -0,0 +1,4 @@
41
+A
42
+B
43
+1
44
+2
45

46
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
47
Author: A U Thor <author@example.com>
48
Date:   Mon Jun 26 00:02:00 2006 +0000
49

50
    Third
51

52
diff --git a/dir/sub b/dir/sub
53
index 8422d40..cead32e 100644
54
--- a/dir/sub
55
+++ b/dir/sub
56
@@ -2,3 +2,5 @@ A
57
 B
58
 C
59
 D
60
+E
61
+F
62
diff --git a/file1 b/file1
63
new file mode 100644
64
index 0000000..b1e6722
65
--- /dev/null
66
+++ b/file1
67
@@ -0,0 +1,3 @@
68
+A
69
+B
70
+C
71

72
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
73
Author: A U Thor <author@example.com>
74
Date:   Mon Jun 26 00:01:00 2006 +0000
75

76
    Second
77
    
78
    This is the second commit.
79

80
diff --git a/dir/sub b/dir/sub
81
index 35d242b..8422d40 100644
82
--- a/dir/sub
83
+++ b/dir/sub
84
@@ -1,2 +1,4 @@
85
 A
86
 B
87
+C
88
+D
89
diff --git a/file0 b/file0
90
index 01e79c3..b414108 100644
91
--- a/file0
92
+++ b/file0
93
@@ -1,3 +1,6 @@
94
 1
95
 2
96
 3
97
+4
98
+5
99
+6
100
diff --git a/file2 b/file2
101
deleted file mode 100644
102
index 01e79c3..0000000
103
--- a/file2
104
+++ /dev/null
105
@@ -1,3 +0,0 @@
106
-1
107
-2
108
-3
109

110
commit 444ac553ac7612cc88969031b02b3767fb8a353a
111
Author: A U Thor <author@example.com>
112
Date:   Mon Jun 26 00:00:00 2006 +0000
113

114
    Initial
115

116
diff --git a/dir/sub b/dir/sub
117
new file mode 100644
118
index 0000000..35d242b
119
--- /dev/null
120
+++ b/dir/sub
121
@@ -0,0 +1,2 @@
122
+A
123
+B
124
diff --git a/file0 b/file0
125
new file mode 100644
126
index 0000000..01e79c3
127
--- /dev/null
128
+++ b/file0
129
@@ -0,0 +1,3 @@
130
+1
131
+2
132
+3
133
diff --git a/file2 b/file2
134
new file mode 100644
135
index 0000000..01e79c3
136
--- /dev/null
137
+++ b/file2
138
@@ -0,0 +1,3 @@
139
+1
140
+2
141
+3
142
$
143