diff --git a/README.md b/README.md index cba41eb8..be978f34 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ For a better look, those sections can be colored differently, depending on vario * Tiny core written with extensibility in mind ([open/closed principle][8]). * Integrates with a variety of plugins, including: [vim-bufferline][6], - [fugitive][4], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], + [fugitive][4], [flog][62], [unite][9], [ctrlp][10], [minibufexpl][15], [gundo][16], [undotree][17], [nerdtree][18], [tagbar][19], [vim-gitgutter][29], [vim-signify][30], [quickfixsigns][39], [syntastic][5], [eclim][34], [lawrencium][21], [virtualenv][31], [tmuxline][35], [taboo.vim][37], @@ -169,6 +169,9 @@ vim-airline integrates with a variety of plugins out of the box. These extensio #### [vimagit][50] ![vim-airline-vimagit-demo](https://cloud.githubusercontent.com/assets/533068/22107273/2ea85ba0-de4d-11e6-9fa8-331103b88df4.gif) +#### [flog][62] +![vim-flog-airline-demo](https://user-images.githubusercontent.com/5008897/120819897-4e820280-c554-11eb-963e-6c08a1bbae09.png) + #### [virtualenv][31] ![image](https://f.cloud.github.com/assets/390964/1022566/cf81f830-0d98-11e3-904f-cf4fe3ce201e.png) @@ -365,3 +368,4 @@ If you are interested in becoming a maintainer (we always welcome more maintaine [59]: https://github.com/neoclide/coc-git [60]: https://github.com/cdelledonne/vim-cmake [61]: http://github.com/lambdalisue/battery.vim/ +[62]: http://github.com/rbong/vim-flog/ diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim index b0355b09..64fa6a53 100644 --- a/autoload/airline/extensions.vim +++ b/autoload/airline/extensions.vim @@ -26,6 +26,7 @@ let s:filetype_overrides = { \ 'coc-explorer': [ 'CoC Explorer', '' ], \ 'defx': ['defx', '%{b:defx.paths[0]}'], \ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'], + \ 'floggraph': [ 'Flog', '%{get(b:, "flog_status_summary", "")}' ], \ 'gundo': [ 'Gundo', '' ], \ 'help': [ 'Help', '%f' ], \ 'minibufexpl': [ 'MiniBufExplorer', '' ], diff --git a/doc/airline.txt b/doc/airline.txt index 2459b571..03773e41 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -231,6 +231,7 @@ values): \ 'coc-explorer': [ 'CoC Explorer', '' ], \ 'defx': ['defx', '%{b:defx.paths[0]}'], \ 'fugitive': ['fugitive', '%{airline#util#wrap(airline#extensions#branch#get_head(),80)}'], + \ 'floggraph': [ 'Flog', '%{get(b:, "flog_status_summary", "")}' ], \ 'gundo': [ 'Gundo', '' ], \ 'help': [ 'Help', '%f' ], \ 'minibufexpl': [ 'MiniBufExplorer', '' ], @@ -606,6 +607,13 @@ characters. let g:airline#extensions#branch#vcs_checks = ['untracked', 'dirty'] < +------------------------------------- *airline-flog* +vim-flog + +If vim-flog is installed, vim-airline will display the branch name +together with a status summary in the git log graph buffer; +either 'no changes' or the number of added/removed/modified files. + ------------------------------------- *airline-bufferline* vim-bufferline