git-rerere: reuse recorded resolve.

diff --git a/git-commit.sh b/git-commit.sh
index 10946ed5f9e4fb25a7b0b76617f223fc43f4b726..9c940837578b6b2925f72838b211cf8928c1baab 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -245,6 +245,7 @@ else
 fi
 ret="$?"
 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG"
+git-rerere
 
 if test -x "$GIT_DIR"/hooks/post-commit && test "$ret" = 0
 then