Andrew's git - gitweb.git/blob - t/t4013/diff.log_-m_-p_--first-parent

   1$ git log -m -p --first-parent 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
   9diff --git a/dir/sub b/dir/sub
  10index cead32e..992913c 100644
  11--- a/dir/sub
  12+++ b/dir/sub
  13@@ -4,3 +4,5 @@ C
  14 D
  15 E
  16 F
  17+1
  18+2
  19diff --git a/file0 b/file0
  20index b414108..10a8a9f 100644
  21--- a/file0
  22+++ b/file0
  23@@ -4,3 +4,6 @@
  24 4
  25 5
  26 6
  27+A
  28+B
  29+C
  30
  31commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  32Author: A U Thor <author@example.com>
  33Date:   Mon Jun 26 00:02:00 2006 +0000
  34
  35    Third
  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
  47diff --git a/file1 b/file1
  48new file mode 100644
  49index 0000000..b1e6722
  50--- /dev/null
  51+++ b/file1
  52@@ -0,0 +1,3 @@
  53+A
  54+B
  55+C
  56
  57commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
  58Author: A U Thor <author@example.com>
  59Date:   Mon Jun 26 00:01:00 2006 +0000
  60
  61    Second
  62    
  63    This is the second commit.
  64
  65diff --git a/dir/sub b/dir/sub
  66index 35d242b..8422d40 100644
  67--- a/dir/sub
  68+++ b/dir/sub
  69@@ -1,2 +1,4 @@
  70 A
  71 B
  72+C
  73+D
  74diff --git a/file0 b/file0
  75index 01e79c3..b414108 100644
  76--- a/file0
  77+++ b/file0
  78@@ -1,3 +1,6 @@
  79 1
  80 2
  81 3
  82+4
  83+5
  84+6
  85diff --git a/file2 b/file2
  86deleted file mode 100644
  87index 01e79c3..0000000
  88--- a/file2
  89+++ /dev/null
  90@@ -1,3 +0,0 @@
  91-1
  92-2
  93-3
  94
  95commit 444ac553ac7612cc88969031b02b3767fb8a353a
  96Author: A U Thor <author@example.com>
  97Date:   Mon Jun 26 00:00:00 2006 +0000
  98
  99    Initial
 100$