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

Recognize pull.rebase=preserve in :Gstatus

Browse Source
This commit is contained in:
Tim Pope
2020-01-25 18:28:35 -05:00
parent 90b7d98b6c
commit 76ffaf4e7d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
autoload/fugitive.vim
View File

@@ -1890,7 +1890,7 @@ function! fugitive#BufReadStatus() abort
if empty(rebase) if empty(rebase)
let rebase = fugitive#Config('pull.rebase', config) let rebase = fugitive#Config('pull.rebase', config)
endif endif
if rebase =~# '^\%(true\|yes\|on\|1\|interactive\)$' if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$'
let pull_type = 'Rebase' let pull_type = 'Rebase'
elseif rebase =~# '^\%(false\|no|off\|0\|\)$' elseif rebase =~# '^\%(false\|no|off\|0\|\)$'
let pull_type = 'Merge' let pull_type = 'Merge'