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

   1$ git log --root --patch-with-stat master
   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 file0   |    3 +++
  17 file3   |    4 ++++
  18 3 files changed, 9 insertions(+), 0 deletions(-)
  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 889b315013ef9f2e2f90aa0b054b267c8a557847
  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(+), 0 deletions(-)
  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 7952a93e09bf565b5592766a438b40cd81f4846f
  82Author: A U Thor <author@example.com>
  83Date:   Mon Jun 26 00:01:00 2006 +0000
  84
  85    Second
  86---
  87 dir/sub |    2 ++
  88 file0   |    3 +++
  89 file2   |    3 ---
  90 3 files changed, 5 insertions(+), 3 deletions(-)
  91
  92diff --git a/dir/sub b/dir/sub
  93index 35d242b..8422d40 100644
  94--- a/dir/sub
  95+++ b/dir/sub
  96@@ -1,2 +1,4 @@
  97 A
  98 B
  99+C
 100+D
 101diff --git a/file0 b/file0
 102index 01e79c3..b414108 100644
 103--- a/file0
 104+++ b/file0
 105@@ -1,3 +1,6 @@
 106 1
 107 2
 108 3
 109+4
 110+5
 111+6
 112diff --git a/file2 b/file2
 113deleted file mode 100644
 114index 01e79c3..0000000
 115--- a/file2
 116+++ /dev/null
 117@@ -1,3 +0,0 @@
 118-1
 119-2
 120-3
 121
 122commit 444ac553ac7612cc88969031b02b3767fb8a353a
 123Author: A U Thor <author@example.com>
 124Date:   Mon Jun 26 00:00:00 2006 +0000
 125
 126    Initial
 127---
 128 dir/sub |    2 ++
 129 file0   |    3 +++
 130 file2   |    3 +++
 131 3 files changed, 8 insertions(+), 0 deletions(-)
 132
 133diff --git a/dir/sub b/dir/sub
 134new file mode 100644
 135index 0000000..35d242b
 136--- /dev/null
 137+++ b/dir/sub
 138@@ -0,0 +1,2 @@
 139+A
 140+B
 141diff --git a/file0 b/file0
 142new file mode 100644
 143index 0000000..01e79c3
 144--- /dev/null
 145+++ b/file0
 146@@ -0,0 +1,3 @@
 147+1
 148+2
 149+3
 150diff --git a/file2 b/file2
 151new file mode 100644
 152index 0000000..01e79c3
 153--- /dev/null
 154+++ b/file2
 155@@ -0,0 +1,3 @@
 156+1
 157+2
 158+3
 159$