t / t4013 / diff.log_--patch-with-stat_master_--_dir_on commit Merge branch 'js/merge-base' (bf928e9)
   1$ git log --patch-with-stat master -- dir/
   2commit 176b998f5d647cbd77a9d8acf4531e930754d16d
   3Merge: 889b315... c7a2ab9...
   4Author: A U Thor <author@example.com>
   5Date:   Mon Jun 26 00:04:00 2006 +0000
   6
   7    Merge branch 'side'
   8
   9commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
  10Author: A U Thor <author@example.com>
  11Date:   Mon Jun 26 00:03:00 2006 +0000
  12
  13    Side
  14---
  15 dir/sub |    2 ++
  16 1 files changed, 2 insertions(+), 0 deletions(-)
  17
  18diff --git a/dir/sub b/dir/sub
  19index 35d242b..7289e35 100644
  20--- a/dir/sub
  21+++ b/dir/sub
  22@@ -1,2 +1,4 @@
  23 A
  24 B
  25+1
  26+2
  27
  28commit 889b315013ef9f2e2f90aa0b054b267c8a557847
  29Author: A U Thor <author@example.com>
  30Date:   Mon Jun 26 00:02:00 2006 +0000
  31
  32    Third
  33---
  34 dir/sub |    2 ++
  35 1 files changed, 2 insertions(+), 0 deletions(-)
  36
  37diff --git a/dir/sub b/dir/sub
  38index 8422d40..cead32e 100644
  39--- a/dir/sub
  40+++ b/dir/sub
  41@@ -2,3 +2,5 @@ A
  42 B
  43 C
  44 D
  45+E
  46+F
  47
  48commit 7952a93e09bf565b5592766a438b40cd81f4846f
  49Author: A U Thor <author@example.com>
  50Date:   Mon Jun 26 00:01:00 2006 +0000
  51
  52    Second
  53---
  54 dir/sub |    2 ++
  55 1 files changed, 2 insertions(+), 0 deletions(-)
  56
  57diff --git a/dir/sub b/dir/sub
  58index 35d242b..8422d40 100644
  59--- a/dir/sub
  60+++ b/dir/sub
  61@@ -1,2 +1,4 @@
  62 A
  63 B
  64+C
  65+D
  66
  67commit 444ac553ac7612cc88969031b02b3767fb8a353a
  68Author: A U Thor <author@example.com>
  69Date:   Mon Jun 26 00:00:00 2006 +0000
  70
  71    Initial
  72$