X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=52b5669b431140cb44cc65a25ae980f45d70fbe0;hb=ebcffb1d44643bab69671abdf79209489e64dbef;hp=2c517ede590c5c3274b03d1c980f9a847cc7d643;hpb=14f0e48db7e1b0c5ec1b831f47214b972b4582d4;p=git.git

diff --git a/git-am.sh b/git-am.sh
index 2c517ede5..52b5669b4 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -5,7 +5,7 @@
 SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_SPEC="\
-git-am [options] <mbox>|<Maildir>...
+git-am [options] [<mbox>|<Maildir>...]
 git-am [options] --resolved
 git-am [options] --skip
 --
@@ -30,7 +30,8 @@ set_reflog_action am
 require_work_tree
 cd_to_toplevel
 
-git var GIT_COMMITTER_IDENT >/dev/null || exit
+git var GIT_COMMITTER_IDENT >/dev/null ||
+	die "You need to set your committer info first"
 
 stop_here () {
     echo "$1" >"$dotest/next"
@@ -241,6 +242,7 @@ else
 		: >"$dotest/rebasing"
 	else
 		: >"$dotest/applying"
+		git update-ref ORIG_HEAD HEAD
 	fi
 fi