Merge fixes up to GIT 1.1.5

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index abb8fc89f4a2aeda697ce25ddadf1ecf3e93e1b6..47705de4fc4b525f2b686d628473f63ec4f53da2 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -8,7 +8,9 @@ git-format-patch - Prepare patches for e-mail submission.
 
 SYNOPSIS
 --------
-'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox] [--diff-options] <his> [<mine>]
+[verse]
+'git-format-patch' [-n | -k] [-o <dir> | --stdout] [-s] [-c] [--mbox]
+                [--diff-options] <his> [<mine>]
 
 DESCRIPTION
 -----------
@@ -84,10 +86,19 @@ git-format-patch origin::
        pulled from origin the last time in a patch form for
        e-mail submission.
 
+git-format-patch -M -B origin::
+       The same as the previous one, except detect and handle
+       renames and complete rewrites intelligently to produce
+       renaming patch.  A renaming patch reduces the amount of
+       text output, and generally makes it easier to review
+       it.  Note that the "patch" program does not understand
+       renaming patch well, so use it only when you know the
+       recipient uses git to apply your patch.
+
 
 See Also
 --------
-gitlink:git-am[1], gitlink:git-send-email
+gitlink:git-am[1], gitlink:git-send-email[1]
 
 
 Author