X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=git-format-patch.sh;h=daa3caea778e13e946c4ffe53c876f5222ce7dfe;hb=d0d14cf33d0e4446ed98b03ac5f81367d368e557;hp=921feee59cd7e770328fc1d167e01730a238489e;hpb=a9572072f0ab0ac97e64b0dc01254a3ad95befe1;p=git.git

diff --git a/git-format-patch.sh b/git-format-patch.sh
index 921feee5..daa3caea 100755
--- a/git-format-patch.sh
+++ b/git-format-patch.sh
@@ -3,19 +3,8 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-. git-sh-setup
-
-# Force diff to run in C locale.
-LANG=C LC_ALL=C
-export LANG LC_ALL
-
-usage () {
-    echo >&2 "usage: $0"' [-n] [-o dir | --stdout] [--keep-subject] [--mbox]
-    [--check] [--signoff] [-<diff options>...]
-    [--help]
-    ( from..to ... | upstream [ our-head ] )
-
-Prepare each commit with its patch since our-head forked from upstream,
+USAGE='[-n | -k] [-o <dir> | --stdout] [--signoff] [--check] [--mbox] [--diff-options] <upstream> [<our-head>]'
+LONG_USAGE='Prepare each commit with its patch since our-head forked from upstream,
 one file per patch, for e-mail submission.  Each output file is
 numbered sequentially from 1, and uses the first line of the commit
 message (massaged for pathname safety) as the filename.
@@ -28,10 +17,12 @@ as "[PATCH N/M] Subject", unless you have only one patch.
 
 When --mbox is specified, the output is formatted to resemble
 UNIX mailbox format, and can be concatenated together for processing
-with applymbox.
-'
-    exit 1
-}
+with applymbox.'
+. git-sh-setup
+
+# Force diff to run in C locale.
+LANG=C LC_ALL=C
+export LANG LC_ALL
 
 diff_opts=
 LF='
@@ -219,6 +210,8 @@ Date: '"$ad"
 	}
 
 	mailScript="$mailScript"'
+	a\
+
 	: body
 	p
 	n