m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-11 12:53:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't run pre-commit hook on merge

Browse Source
This commit is contained in:
Tim Pope
2014-07-07 21:23:22 -04:00
parent 11f89ba749
commit 9af975c82c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/fugitive.vim
View File

@@ -1165,7 +1165,7 @@ function! s:Merge(cmd, bang, args) abort
if empty(filter(getqflist(),'v:val.valid')) if empty(filter(getqflist(),'v:val.valid'))
if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG')) if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG'))
cclose 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
endif endif
let qflist = getqflist() let qflist = getqflist()