aboutsummaryrefslogtreecommitdiffstats
path: root/dotvimrc
diff options
context:
space:
mode:
authorMatthias Brändli <matthias.braendli@u-blox.com>2016-08-03 15:46:20 +0200
committerMatthias Brändli <matthias.braendli@u-blox.com>2016-08-03 15:46:20 +0200
commit4e88d540844926d408d4e73807e213e71fd1436c (patch)
tree8ecf4d4954d15173f74db68c4e3c2b32697417a3 /dotvimrc
parent61b8a9c29ba8f4e6324446f4db47757011c6b085 (diff)
downloadvimrc-4e88d540844926d408d4e73807e213e71fd1436c.tar.gz
vimrc-4e88d540844926d408d4e73807e213e71fd1436c.tar.bz2
vimrc-4e88d540844926d408d4e73807e213e71fd1436c.zip
Replace git-vim by fugitive
Diffstat (limited to 'dotvimrc')
-rw-r--r--dotvimrc6
1 files changed, 4 insertions, 2 deletions
diff --git a/dotvimrc b/dotvimrc
index 50b960e..ab5b683 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -60,7 +60,7 @@ NeoBundle 'Shougo/vimproc'
NeoBundle 'mileszs/ack.vim.git'
noremap <Leader>a :Ack --cpp --cc <cword><CR>
-NeoBundle 'motemen/git-vim.git'
+NeoBundle 'tpope/vim-fugitive'
"Show + - ~ in the margin for vim modification
NeoBundle "airblade/vim-gitgutter"
@@ -158,6 +158,7 @@ set statusline+=%{((exists(\"+bomb\")\ &&\ &bomb)?\"B,\":\"\")}]\ " BOM
set statusline+=%{strftime('%a\ %b\ %e\ %H:%M')}\ " hour
"set statusline+=%{SyntaxItem()} " syntax highlight group under cursor
set statusline+=%= " right align
+set statusline+=%{fugitive#statusline()}\ " git branch
set statusline+=0x%-8B\ " current char
set statusline+=%-14.(%l,%c%V%)\ %<%P " offset
@@ -274,8 +275,9 @@ noremap ]e :cnext<CR>
noremap [h :GitGutterPrevHunk<CR>
noremap ]h :GitGutterNextHunk<CR>
-"GIT timelapse
+"GIT stuff
noremap <Leader>gt :call TimeLapse()<cr>
+noremap <Leader>gb :Gblame<cr>
noremap <Leader>e :NERDTreeToggle<CR>