From 76ffaf4e7d1143c50017d8c5d8fcdb32fe1f33a7 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sat, 25 Jan 2020 18:28:35 -0500
Subject: [PATCH] Recognize pull.rebase=preserve in :Gstatus

---
 autoload/fugitive.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index edeefd2..3b5a5d1 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -1890,7 +1890,7 @@ function! fugitive#BufReadStatus() abort
       if empty(rebase)
         let rebase = fugitive#Config('pull.rebase', config)
       endif
-      if rebase =~# '^\%(true\|yes\|on\|1\|interactive\)$'
+      if rebase =~# '^\%(true\|yes\|on\|1\|interactive\|merges\|preserve\)$'
         let pull_type = 'Rebase'
       elseif rebase =~# '^\%(false\|no|off\|0\|\)$'
         let pull_type = 'Merge'