[PATCH 1/2] documentation fix: git log -p does not imply -c.

From: Adam Monsen <haircut@gmail.com>
Date: Mar 5, 2011, 19:56 UTC
Message-ID: <1299355004-3532-2-git-send-email-haircut@gmail.com>
In-Reply-To: <4D724A0F.7050904@gmail.com>

Relates to the thread with subject "frustrated forensics: hard to find diff that undid a fix" on the git mailing list.

	http://thread.gmane.org/gmane.comp.version-control.git/168481

I don't wish for anyone to repeat my bungled forensics episode. Hopefully this will help others git along happily.

Signed-off-by: Adam Monsen <haircut@gmail.com>
---
 Documentation/diff-generate-patch.txt |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 3ac2bea..6cd5270 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -75,10 +75,9 @@ combined diff format
 --------------------
 
 "git-diff-tree", "git-diff-files" and "git-diff" can take '-c' or
-'--cc' option to produce 'combined diff'.  For showing a merge commit
-with "git log -p", this is the default format; you can force showing
-full diff with the '-m' option.
-A 'combined diff' format looks like this:
+'--cc' option to produce 'combined diff'.  You can force showing
+full diff with the '-m' option.  A 'combined diff' format looks like
+this:
 
 ------------
 diff --combined describe.c

-- 
1.7.2.3