diff --git a/git-am.sh b/git-am.sh
index 731ab1fffa4fbe563ab5e2c09cbbdca07e16cac4..85ecada657d21aba4b54034dbaf869f8387d7d02 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
#!/bin/sh
#
-#
+# Copyright (c) 2005, 2006 Junio C Hamano
USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox>
or, when resuming [--skip | --resolved]'
. git-sh-setup
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
stop_here () {
echo "$1" >"$dotest/next"
exit 1
# saying that we reverted all those changes.
git-merge-resolve $orig_tree -- HEAD $his_tree || {
+ if test -d "$GIT_DIR/rr-cache"
+ then
+ git-rerere
+ fi
echo Failed to merge in the changes.
exit 1
}