mirror of
https://github.com/SpaceVim/SpaceVim.git
synced 2025-01-23 13:10:04 +08:00
feat(git): compete merge options
This commit is contained in:
parent
f80b8fd88e
commit
0559ad462d
@ -102,8 +102,9 @@ endfunction
|
||||
|
||||
function! s:args_with_two() abort
|
||||
return join([
|
||||
\ '--stat',
|
||||
\ '--stat', '--summary', '--log', '--commit', '--cleanup', '--abort', '--continue',
|
||||
\ '--edit',
|
||||
\ '--squash',
|
||||
\ '--ff',
|
||||
\ '--ff-only',
|
||||
\ '--abort',
|
||||
@ -113,6 +114,7 @@ endfunction
|
||||
function! s:args_with_one() abort
|
||||
return join([
|
||||
\ '-m',
|
||||
\ '-F',
|
||||
\ '-e',
|
||||
\ ], "\n")
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user