X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=97ec2d0c7db521047e254e53120ffc83829868a9;hb=ed90cbf5f681c0144909457be3f4792b47604a5b;hp=115ebaddf595f49059208ac890308b6ebe01aa42;hpb=72e5890b68e7199d92620d3bba91fa36dd259404;p=git.git
diff --git a/git-am.sh b/git-am.sh
index 115ebaddf..97ec2d0c7 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=