X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=4232e27411036e339f8102e45b7cb699c808a798;hb=e8dff6ba8b12db94b728ff4d0ebf65040de92c37;hp=51ea168e03b0d1e4a906f5f17ead431ca3884502;hpb=2c674191d507647b4c34486619189d7c6f5dbab9;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 51ea168e..4232e274 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -1,26 +1,43 @@
#!/bin/sh
#
-#
-. git-sh-setup || die "Not a git archive"
+# Copyright (c) 2005, 2006 Junio C Hamano
-files=$(git-diff-index --cached --name-only HEAD) || exit
-if [ "$files" ]; then
- echo "Dirty index: cannot apply patches (dirty: $files)" >&2
- exit 1
-fi
+USAGE='[--signoff] [--dotest=
] [--utf8] [--binary] [--3way]
+ [--interactive] [--whitespace=