diff --git a/git-resolve.sh b/git-resolve.sh
index 7d8fb54f952e3f85c8c77b8fd9c67afbe76f0316..b53ede8d87b7473fb5b5239228008be372797552 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
#
# Resolve two trees.
#
-. git-sh-setup || die "Not a git archive"
-usage () {
- die "git-resolve <head> <remote> <merge-message>"
-}
+USAGE='<head> <remote> <merge-message>'
+. git-sh-setup
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
;;
esac
+# We are going to make a new commit.
+git var GIT_COMMITTER_IDENT >/dev/null || exit
+
# Find an optimum merge base if there are more than one candidates.
LF='
'