Merge branch 'jk/log-fp-implies-m'

"git log --first-parent -p" showed patches only for single-parent
commits on the first-parent chain; the "--first-parent" option has
been made to imply "-m".  Use "--no-diff-merges" to restore the
previous behaviour to omit patches for merge commits.

* jk/log-fp-implies-m:
  doc/git-log: clarify handling of merge commit diffs
  doc/git-log: move "-t" into diff-options list
  doc/git-log: drop "-r" diff option
  doc/git-log: move "Diff Formatting" from rev-list-options
  log: enable "-m" automatically with "--first-parent"
  revision: add "--no-diff-merges" option to counteract "-m"
  log: drop "--cc implies -m" logic

diff --cc Documentation/git-log.txt
Simple merge

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge

diff --cc t/t4013-diff-various.sh
Simple merge

diff --cc t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
index 0000000000000000000000000000000000000000,94bf1850b29bbfb8f1f1917c8d35c98633733521..597002232e5209bcc3723baecacc0339258487c7
mode 000000,100644..100644
--- /dev/null
--- 2/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
+++ b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
@@@ -1,0 -1,78 +1,78 @@@
 -    Merge branch 'side' into master
+ $ git log --no-diff-merges -p --first-parent master
+ commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+ Merge: 9a6d494 c7a2ab9
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:04:00 2006 +0000
+ 
++    Merge branch 'side'
+ 
+ commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:02:00 2006 +0000
+ 
+     Third
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 8422d40..cead32e 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -2,3 +2,5 @@ A
+  B
+  C
+  D
+ +E
+ +F
+ diff --git a/file1 b/file1
+ new file mode 100644
+ index 0000000..b1e6722
+ --- /dev/null
+ +++ b/file1
+ @@ -0,0 +1,3 @@
+ +A
+ +B
+ +C
+ 
+ commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:01:00 2006 +0000
+ 
+     Second
+     
+     This is the second commit.
+ 
+ diff --git a/dir/sub b/dir/sub
+ index 35d242b..8422d40 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -1,2 +1,4 @@
+  A
+  B
+ +C
+ +D
+ diff --git a/file0 b/file0
+ index 01e79c3..b414108 100644
+ --- a/file0
+ +++ b/file0
+ @@ -1,3 +1,6 @@
+  1
+  2
+  3
+ +4
+ +5
+ +6
+ diff --git a/file2 b/file2
+ deleted file mode 100644
+ index 01e79c3..0000000
+ --- a/file2
+ +++ /dev/null
+ @@ -1,3 +0,0 @@
+ -1
+ -2
+ -3
+ 
+ commit 444ac553ac7612cc88969031b02b3767fb8a353a
+ Author: A U Thor <author@example.com>
+ Date:   Mon Jun 26 00:00:00 2006 +0000
+ 
+     Initial
+ $

diff --cc t/t4013/diff.log_-p_--first-parent_master
index 3fc896d424f9471aa793cd6e9e0dda41264acb9b,fe044399f04ecc672340b405ae807a976b1c8fb6..28840ebea1e33a41402b392833093df2e92f8035
--- 1/t/t4013/diff.log_-p_--first-parent_master
--- 2/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@@ -4,8 -4,30 +4,30 @@@ Merge: 9a6d494 c7a2ab
  Author: A U Thor <author@example.com>
  Date:   Mon Jun 26 00:04:00 2006 +0000
  
 -    Merge branch 'side' into master
 +    Merge branch 'side'
  
+ diff --git a/dir/sub b/dir/sub
+ index cead32e..992913c 100644
+ --- a/dir/sub
+ +++ b/dir/sub
+ @@ -4,3 +4,5 @@ C
+  D
+  E
+  F
+ +1
+ +2
+ diff --git a/file0 b/file0
+ index b414108..10a8a9f 100644
+ --- a/file0
+ +++ b/file0
+ @@ -4,3 +4,6 @@
+  4
+  5
+  6
+ +A
+ +B
+ +C
+ 
  commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
  Author: A U Thor <author@example.com>
  Date:   Mon Jun 26 00:02:00 2006 +0000