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