X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-resolve.sh;h=b53ede8d87b7473fb5b5239228008be372797552;hb=d64e6b04291e2313343866a6b206caf13313f1f9;hp=926307005493b7c8c4253b1adff34bdb4bc57b77;hpb=90768daaa006516c7ae69ed89d7c2e67243dfac1;p=git.git

diff --git a/git-resolve.sh b/git-resolve.sh
index 92630700..b53ede8d 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -50,6 +50,9 @@ case "$common" in
 	;;
 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='
 '