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@xxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html