2006-06-27 06:29:11 +00:00
|
|
|
$ git log --patch-with-stat --summary master -- dir/
|
2006-07-14 02:51:12 +00:00
|
|
|
commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
|
2009-02-13 22:10:41 +00:00
|
|
|
Merge: 9a6d494 c7a2ab9
|
2006-06-27 06:29:11 +00:00
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
Date: Mon Jun 26 00:04:00 2006 +0000
|
|
|
|
|
|
|
|
Merge branch 'side'
|
|
|
|
|
|
|
|
commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
Date: Mon Jun 26 00:03:00 2006 +0000
|
|
|
|
|
|
|
|
Side
|
|
|
|
---
|
2012-04-30 20:38:58 +00:00
|
|
|
dir/sub | 2 ++
|
2012-02-01 12:55:07 +00:00
|
|
|
1 file changed, 2 insertions(+)
|
2006-06-27 06:29:11 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2006-07-14 02:51:12 +00:00
|
|
|
commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
|
2006-06-27 06:29:11 +00:00
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
Date: Mon Jun 26 00:02:00 2006 +0000
|
|
|
|
|
|
|
|
Third
|
|
|
|
---
|
2012-04-30 20:38:58 +00:00
|
|
|
dir/sub | 2 ++
|
2012-02-01 12:55:07 +00:00
|
|
|
1 file changed, 2 insertions(+)
|
2006-06-27 06:29:11 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2006-07-14 02:51:12 +00:00
|
|
|
commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
|
2006-06-27 06:29:11 +00:00
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
Date: Mon Jun 26 00:01:00 2006 +0000
|
|
|
|
|
|
|
|
Second
|
2006-07-14 02:51:12 +00:00
|
|
|
|
|
|
|
This is the second commit.
|
2006-06-27 06:29:11 +00:00
|
|
|
---
|
2012-04-30 20:38:58 +00:00
|
|
|
dir/sub | 2 ++
|
2012-02-01 12:55:07 +00:00
|
|
|
1 file changed, 2 insertions(+)
|
2006-06-27 06:29:11 +00:00
|
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
commit 444ac553ac7612cc88969031b02b3767fb8a353a
|
|
|
|
Author: A U Thor <author@example.com>
|
|
|
|
Date: Mon Jun 26 00:00:00 2006 +0000
|
|
|
|
|
|
|
|
Initial
|
|
|
|
$
|