Merge pull request #1677 from Cimbali/master

Disable fugitiveline if bufferline is activated

autoload/airline/extensions.vim

@@ -231,6 +231,7 @@ function! airline#extensions#load()
 
   if get(g:, 'airline#extensions#fugitiveline#enabled', 1)
         \ && exists('*fugitive#head')
+        \ && index(loaded_ext, 'bufferline') == -1
     call airline#extensions#fugitiveline#init(s:ext)
     call add(loaded_ext, 'fugitiveline')
   endif

doc/airline.txt

@@ -406,6 +406,7 @@ vim-bufferline <https://github.com/bling/vim-bufferline>
 -------------------------------------                   *airline-fugitiveline*
 This extension hides the fugitive://**// part of the buffer names, to only
 show the file name as if it were in the current working tree.
+It is deactivated by default if *airline-bufferline* is activated.
 
 * enable/disable bufferline integration >
   let g:airline#extensions#fugitiveline#enabled = 1