Merge branch 'maint'

diff --git a/git-commit.sh b/git-commit.sh
index be3677c2049dca4deb35403804d5ea2d72254e7d..b8c00b823656f36f6a6f38493b9569831db713b1 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -622,6 +622,9 @@ else
 fi
 ret="$?"
 rm -f "$GIT_DIR/COMMIT_MSG" "$GIT_DIR/COMMIT_EDITMSG" "$GIT_DIR/SQUASH_MSG"
+
+cd_to_toplevel
+
 if test -d "$GIT_DIR/rr-cache"
 then
        git-rerere