From 9af975c82c99318b908c61b12e443e8ba6dea217 Mon Sep 17 00:00:00 2001 From: Tim Pope Date: Mon, 7 Jul 2014 21:23:22 -0400 Subject: [PATCH] Don't run pre-commit hook on merge --- plugin/fugitive.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim index abb27e0..256c1aa 100644 --- a/plugin/fugitive.vim +++ b/plugin/fugitive.vim @@ -1165,7 +1165,7 @@ function! s:Merge(cmd, bang, args) abort if empty(filter(getqflist(),'v:val.valid')) if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG')) cclose - return 'Gcommit --no-status -t '.s:shellesc(s:repo().dir('MERGE_MSG')) + return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG')) endif endif let qflist = getqflist()