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

From: Adam Monsen <haircut@gmail.com>
Date: Mar 7, 2011, 21:57 UTC
Message-ID: <1299535063-1020-1-git-send-email-haircut@gmail.com>
In-Reply-To: <20110307191218.GA20930@sigill.intra.peff.net>

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>
---
This is really Peff's patch, I
* fixed a typo (vie -> view)
* am sending it as an acutal patch in case that's easier to apply than
  a diff in an email

I wasn't sure what "Author:" should be, go ahead and change it to the most appropriate person.

Hope this helps, -Adam

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

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 3ac2bea..5d478c1 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -74,10 +74,12 @@ 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
+produced a 'combined diff' when showing a merge. This is the default
+format when showing merge conflicts with linkgit:git-diff[1] or a merge
+commit with linkgit:git-show[1]. Note also that you can view the full
+diff with the `-m` option.
+
 A 'combined diff' format looks like this:
 
 ------------

-- 
1.7.2.3