X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=Documentation%2Fdiff-generate-patch.txt;h=8f9a2412fd44c80f2bf8d63271e2897ebeb3ddeb;hb=452c6d506b1a6dcf24d4ceaa592afc39c1c1a60e;hp=0f25ba7e3857e6c4f18c3589b31f082b602df6dc;hpb=5ab2f7b2ce8c51e8c47a4cc57c30fa7cae239005;p=git.git

diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index 0f25ba7e3..8f9a2412f 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -56,7 +56,8 @@ 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.
+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:
 
 ------------