X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=507ae4dcb9964e63143661392d7a10d7da4ef33e;hb=31fff305bcc6db3b8082eac7fc9e441b27964fea;hp=8f073c90f6dce20e6e4f3a0b3046cc25dfd503e0;hpb=6eb668df76a5b46bd24c25d227bfdba12542b05a;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 8f073c90..507ae4dc 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,20 +1,39 @@
#!/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=