contrib/git-svn: add --id/-i=$GIT_SVN_ID command-line switch

diff --git a/git-resolve.sh b/git-resolve.sh
index 926307005493b7c8c4253b1adff34bdb4bc57b77..b53ede8d87b7473fb5b5239228008be372797552 100755 (executable)
--- 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='
 '