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

   1$ git log --root --cc --patch-with-stat --summary 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
   9 dir/sub |    2 ++
  10 file0   |    3 +++
  11 2 files changed, 5 insertions(+), 0 deletions(-)
  12
  13diff --cc dir/sub
  14index cead32e,7289e35..992913c
  15--- a/dir/sub
  16+++ b/dir/sub
  17@@@ -1,6 -1,4 +1,8 @@@
  18  A
  19  B
  20 +C
  21 +D
  22 +E
  23 +F
  24+ 1
  25+ 2
  26diff --cc file0
  27index b414108,f4615da..10a8a9f
  28--- a/file0
  29+++ b/file0
  30@@@ -1,6 -1,6 +1,9 @@@
  31  1
  32  2
  33  3
  34 +4
  35 +5
  36 +6
  37+ A
  38+ B
  39+ C
  40
  41commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
  42Author: A U Thor <author@example.com>
  43Date:   Mon Jun 26 00:03:00 2006 +0000
  44
  45    Side
  46---
  47 dir/sub |    2 ++
  48 file0   |    3 +++
  49 file3   |    4 ++++
  50 3 files changed, 9 insertions(+), 0 deletions(-)
  51 create mode 100644 file3
  52
  53diff --git a/dir/sub b/dir/sub
  54index 35d242b..7289e35 100644
  55--- a/dir/sub
  56+++ b/dir/sub
  57@@ -1,2 +1,4 @@
  58 A
  59 B
  60+1
  61+2
  62diff --git a/file0 b/file0
  63index 01e79c3..f4615da 100644
  64--- a/file0
  65+++ b/file0
  66@@ -1,3 +1,6 @@
  67 1
  68 2
  69 3
  70+A
  71+B
  72+C
  73diff --git a/file3 b/file3
  74new file mode 100644
  75index 0000000..7289e35
  76--- /dev/null
  77+++ b/file3
  78@@ -0,0 +1,4 @@
  79+A
  80+B
  81+1
  82+2
  83
  84commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  85Author: A U Thor <author@example.com>
  86Date:   Mon Jun 26 00:02:00 2006 +0000
  87
  88    Third
  89---
  90 dir/sub |    2 ++
  91 file1   |    3 +++
  92 2 files changed, 5 insertions(+), 0 deletions(-)
  93 create mode 100644 file1
  94
  95diff --git a/dir/sub b/dir/sub
  96index 8422d40..cead32e 100644
  97--- a/dir/sub
  98+++ b/dir/sub
  99@@ -2,3 +2,5 @@ A
 100 B
 101 C
 102 D
 103+E
 104+F
 105diff --git a/file1 b/file1
 106new file mode 100644
 107index 0000000..b1e6722
 108--- /dev/null
 109+++ b/file1
 110@@ -0,0 +1,3 @@
 111+A
 112+B
 113+C
 114
 115commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
 116Author: A U Thor <author@example.com>
 117Date:   Mon Jun 26 00:01:00 2006 +0000
 118
 119    Second
 120    
 121    This is the second commit.
 122---
 123 dir/sub |    2 ++
 124 file0   |    3 +++
 125 file2   |    3 ---
 126 3 files changed, 5 insertions(+), 3 deletions(-)
 127 delete mode 100644 file2
 128
 129diff --git a/dir/sub b/dir/sub
 130index 35d242b..8422d40 100644
 131--- a/dir/sub
 132+++ b/dir/sub
 133@@ -1,2 +1,4 @@
 134 A
 135 B
 136+C
 137+D
 138diff --git a/file0 b/file0
 139index 01e79c3..b414108 100644
 140--- a/file0
 141+++ b/file0
 142@@ -1,3 +1,6 @@
 143 1
 144 2
 145 3
 146+4
 147+5
 148+6
 149diff --git a/file2 b/file2
 150deleted file mode 100644
 151index 01e79c3..0000000
 152--- a/file2
 153+++ /dev/null
 154@@ -1,3 +0,0 @@
 155-1
 156-2
 157-3
 158
 159commit 444ac553ac7612cc88969031b02b3767fb8a353a
 160Author: A U Thor <author@example.com>
 161Date:   Mon Jun 26 00:00:00 2006 +0000
 162
 163    Initial
 164---
 165 dir/sub |    2 ++
 166 file0   |    3 +++
 167 file2   |    3 +++
 168 3 files changed, 8 insertions(+), 0 deletions(-)
 169 create mode 100644 dir/sub
 170 create mode 100644 file0
 171 create mode 100644 file2
 172
 173diff --git a/dir/sub b/dir/sub
 174new file mode 100644
 175index 0000000..35d242b
 176--- /dev/null
 177+++ b/dir/sub
 178@@ -0,0 +1,2 @@
 179+A
 180+B
 181diff --git a/file0 b/file0
 182new file mode 100644
 183index 0000000..01e79c3
 184--- /dev/null
 185+++ b/file0
 186@@ -0,0 +1,3 @@
 187+1
 188+2
 189+3
 190diff --git a/file2 b/file2
 191new file mode 100644
 192index 0000000..01e79c3
 193--- /dev/null
 194+++ b/file2
 195@@ -0,0 +1,3 @@
 196+1
 197+2
 198+3
 199$