[PATCH v4] Documentation fix: git log -p does not imply -c.

From: Adam Monsen <haircut@gmail.com>
Date: Mar 8, 2011, 00:49 UTC
Message-ID: <1299545378-22036-1-git-send-email-haircut@gmail.com>
In-Reply-To: <7vsjuyzckd.fsf@alter.siamese.dyndns.org>

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.

See also:

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

Signed-off-by: Adam Monsen <haircut@gmail.com>
---

Junio wrote:

> s/produced/produce/, I think.

Ah, indeed. Fixed, thanks.

I also sidestepped the difference between merge commits and conflicts by changing the wording slightly.

Your changes to the "Note" seemed helpful, I put them in. Thanks!

 Documentation/diff-generate-patch.txt |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 3ac2bea..c57460c 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -74,10 +74,13 @@ separate lines indicate the old and the new mode.
 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.
+Any diff-generating command can take the `-c` or `--cc` option to
+produce a 'combined diff' when showing a merge. This is the default
+format when showing merges with linkgit:git-diff[1] or
+linkgit:git-show[1]. Note also that you can give the `-m' option to any
+of these commands to force generation of diffs with individual parents
+of a merge.
+
 A 'combined diff' format looks like this:
 
 ------------

-- 
1.7.2.3