Andrew's git - gitweb.git/blob - t/t4013/diff.log_--patch-with-stat

   1$ git log --patch-with-stat master
   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 file0   | 3 +++
  17 file3   | 4 ++++
  18 3 files changed, 9 insertions(+)
  19
  20diff --git a/dir/sub b/dir/sub
  21index 35d242b..7289e35 100644
  22--- a/dir/sub
  23+++ b/dir/sub
  24@@ -1,2 +1,4 @@
  25 A
  26 B
  27+1
  28+2
  29diff --git a/file0 b/file0
  30index 01e79c3..f4615da 100644
  31--- a/file0
  32+++ b/file0
  33@@ -1,3 +1,6 @@
  34 1
  35 2
  36 3
  37+A
  38+B
  39+C
  40diff --git a/file3 b/file3
  41new file mode 100644
  42index 0000000..7289e35
  43--- /dev/null
  44+++ b/file3
  45@@ -0,0 +1,4 @@
  46+A
  47+B
  48+1
  49+2
  50
  51commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  52Author: A U Thor <author@example.com>
  53Date:   Mon Jun 26 00:02:00 2006 +0000
  54
  55    Third
  56---
  57 dir/sub | 2 ++
  58 file1   | 3 +++
  59 2 files changed, 5 insertions(+)
  60
  61diff --git a/dir/sub b/dir/sub
  62index 8422d40..cead32e 100644
  63--- a/dir/sub
  64+++ b/dir/sub
  65@@ -2,3 +2,5 @@ A
  66 B
  67 C
  68 D
  69+E
  70+F
  71diff --git a/file1 b/file1
  72new file mode 100644
  73index 0000000..b1e6722
  74--- /dev/null
  75+++ b/file1
  76@@ -0,0 +1,3 @@
  77+A
  78+B
  79+C
  80
  81commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
  82Author: A U Thor <author@example.com>
  83Date:   Mon Jun 26 00:01:00 2006 +0000
  84
  85    Second
  86    
  87    This is the second commit.
  88---
  89 dir/sub | 2 ++
  90 file0   | 3 +++
  91 file2   | 3 ---
  92 3 files changed, 5 insertions(+), 3 deletions(-)
  93
  94diff --git a/dir/sub b/dir/sub
  95index 35d242b..8422d40 100644
  96--- a/dir/sub
  97+++ b/dir/sub
  98@@ -1,2 +1,4 @@
  99 A
 100 B
 101+C
 102+D
 103diff --git a/file0 b/file0
 104index 01e79c3..b414108 100644
 105--- a/file0
 106+++ b/file0
 107@@ -1,3 +1,6 @@
 108 1
 109 2
 110 3
 111+4
 112+5
 113+6
 114diff --git a/file2 b/file2
 115deleted file mode 100644
 116index 01e79c3..0000000
 117--- a/file2
 118+++ /dev/null
 119@@ -1,3 +0,0 @@
 120-1
 121-2
 122-3
 123
 124commit 444ac553ac7612cc88969031b02b3767fb8a353a
 125Author: A U Thor <author@example.com>
 126Date:   Mon Jun 26 00:00:00 2006 +0000
 127
 128    Initial
 129$