X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-am.sh;h=85ecada657d21aba4b54034dbaf869f8387d7d02;hb=d64e6b04291e2313343866a6b206caf13313f1f9;hp=98b9215f700b5cb6a01e39f0f0f0100dcb6e395e;hpb=589e4f93c7fc31d73da3d0764c71d939c9332442;p=git.git diff --git a/git-am.sh b/git-am.sh index 98b9215f..85ecada6 100755 --- a/git-am.sh +++ b/git-am.sh @@ -1,11 +1,13 @@ #!/bin/sh # -# +# Copyright (c) 2005, 2006 Junio C Hamano USAGE='[--signoff] [--dotest=] [--utf8] [--binary] [--3way] or, when resuming [--skip | --resolved]' . git-sh-setup +git var GIT_COMMITTER_IDENT >/dev/null || exit + stop_here () { echo "$1" >"$dotest/next" exit 1