t / t4013 / diff.log_--patch-with-stat_master_--_dir_on commit Merge branch 'jn/maint-gitweb-invalid-regexp' into maint (3ecd0c8)
   1$ git log --patch-with-stat master -- dir/
   2commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
   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
   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 file changed, 2 insertions(+)
  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 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  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 file changed, 2 insertions(+)
  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 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
  49Author: A U Thor <author@example.com>
  50Date:   Mon Jun 26 00:01:00 2006 +0000
  51
  52    Second
  53    
  54    This is the second commit.
  55---
  56 dir/sub |    2 ++
  57 1 file changed, 2 insertions(+)
  58
  59diff --git a/dir/sub b/dir/sub
  60index 35d242b..8422d40 100644
  61--- a/dir/sub
  62+++ b/dir/sub
  63@@ -1,2 +1,4 @@
  64 A
  65 B
  66+C
  67+D
  68
  69commit 444ac553ac7612cc88969031b02b3767fb8a353a
  70Author: A U Thor <author@example.com>
  71Date:   Mon Jun 26 00:00:00 2006 +0000
  72
  73    Initial
  74$