From e0dd3d81258eb38204aea48a71af4a18dac6aa30 Mon Sep 17 00:00:00 2001 From: Cimbali Date: Sat, 23 Dec 2017 15:05:59 +0100 Subject: [PATCH] Rename merge file names Clearer names that reference the HEADs of git: FETCH_HEAD, ORIG_HEAD and MERGE_HEAD, rather than the names that fugitive uses for them. --- autoload/airline/extensions/branch.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/airline/extensions/branch.vim b/autoload/airline/extensions/branch.vim index b85c155..9a96197 100644 --- a/autoload/airline/extensions/branch.vim +++ b/autoload/airline/extensions/branch.vim @@ -83,7 +83,7 @@ endif " Fugitive special revisions. call '0' "staging" ? -let s:names = {'0': 'index', '1': 'ancestor', '2':'target', '3':'merged'} +let s:names = {'0': 'index', '1': 'orig', '2':'fetch', '3':'merge'} let s:sha1size = get(g:, 'airline#extensions#branch#sha1_len', 7) function! s:update_git_branch()