klesh/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[feature] add hotkey for confliction merging

Browse Source
This commit is contained in:
Klesh Wong 2020-09-28 11:16:59 +08:00
parent a3234d22ab
commit d9686024b8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nvim/config/init.vim
View File

@ -153,6 +153,10 @@ nnoremap <leader>gp :Gpush<CR>
nnoremap <leader>gg :Gpull<CR>
nnoremap <leader>gd :Gdiff<CR>
nnoremap <leader>gb :Gblame<CR>
nnoremap <leader>gl :Glog<CR>
nnoremap <leader>gms :Gvdiffsplit!<CR>
nnoremap <leader>gmh :diffget //2<CR>
nnoremap <leader>gml :diffget //3<CR>
" ==== ctrlp configuration ====
let g:ctrlp_user_command = ['.git', 'git ls-files -co --exclude-standard']