From 272bd3cfd059cf867b979d5c11b0ccce9bcccbb3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Thu, 1 Nov 2007 15:57:40 +0100
Subject: Include diff options in the git-log manpage

[jc: with quite a few fixups]

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/diff-options.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Documentation/diff-options.txt')

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index e4af393515..d0154bbc0a 100644
--- 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[]
 
-- 
cgit v1.3-5-g9baa