X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=4232e27411036e339f8102e45b7cb699c808a798;hb=HEAD;hp=9e41e7031339670f8077a9fd0ca98c703cc35ea6;hpb=0d0b7c237af0846123bef73879d65a3e78a56461;p=git.git diff --git a/git-am.sh b/git-am.sh index 9e41e703..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=