Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-23 13:00:04 +08:00
Code Issues Projects Releases Wiki Activity

feat(git): compete merge options

Browse Source
This commit is contained in:
Eric Wong 2024-03-04 20:19:11 +08:00
parent f80b8fd88e
commit 0559ad462d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundle/git.vim/autoload/git/merge.vim
View File

@ -102,8 +102,9 @@ endfunction
function! s:args_with_two() abort function! s:args_with_two() abort
return join([ return join([
\ '--stat', \ '--stat', '--summary', '--log', '--commit', '--cleanup', '--abort', '--continue',
\ '--edit', \ '--edit',
\ '--squash',
\ '--ff', \ '--ff',
\ '--ff-only', \ '--ff-only',
\ '--abort', \ '--abort',
@ -113,6 +114,7 @@ endfunction
function! s:args_with_one() abort function! s:args_with_one() abort
return join([ return join([
\ '-m', \ '-m',
\ '-F',
\ '-e', \ '-e',
\ ], "\n") \ ], "\n")