X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=4232e27411036e339f8102e45b7cb699c808a798;hb=b8c92caddac61e556254bf93c3a4bd744de94320;hp=8f073c90f6dce20e6e4f3a0b3046cc25dfd503e0;hpb=8fc66df237afce0b4318657f166b3583831949f3;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 8f073c90..4232e274 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,20 +1,43 @@
#!/bin/sh
#
-#
-. git-sh-setup || die "Not a git archive"
+# Copyright (c) 2005, 2006 Junio C Hamano
-usage () {
- echo >&2 "usage: $0 [--signoff] [--dotest=
] [--utf8] [--binary] [--3way] "
- echo >&2 " or, when resuming"
- echo >&2 " $0 [--skip | --resolved]"
- exit 1;
-}
+USAGE='[--signoff] [--dotest=] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=