diff --git a/vimrc b/vimrc
index ebca7e9..ccd031f 100644
--- a/vimrc
+++ b/vimrc
@@ -165,7 +165,7 @@ if has("autocmd")
     " Don't do it when the position is invalid or when inside an event handler
     " (happens when dropping a file on gvim).
     autocmd BufReadPost *
-                \ if line("'\"") > 0 && line("'\"") <= line("$") |
+                \ if (bufname("%") =~ "COMMIT_EDITMSG") == 0 && line("'\"") > 0 && line("'\"") <= line("$") |
                 \   exe "normal! g`\"" |
                 \ endif