Merge branch 'jc/git-log-doc'

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e4af393515c346528bccb7a4f2d3823aebddddfc..d0154bbc0a2f868b3f5f1c63dcffd1fc9355ebc3 100644 (file)
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -6,7 +6,9 @@
 
 ifndef::git-format-patch[]
 ifndef::git-diff[]
+ifndef::git-log[]
 :git-diff-core: 1
+endif::git-log[]
 endif::git-diff[]
 endif::git-format-patch[]