Skip to content
Browse files

Merge branch 'master' of https://github.com/Soares/config.vim

Conflicts:
	local/mapping/plugin/leader.vim
  • Loading branch information...
2 parents 29b1ccb + 648fdf6 commit a609f2de3a0f8fdedbff78319cb597cf6035e219 @Soares committed
Showing with 5 additions and 1 deletion.
  1. +5 −1 local/mapping/plugin/leader.vim
View
6 local/mapping/plugin/leader.vim
@@ -24,10 +24,12 @@
" C |
" d » diff mode
" dd diff done
+" dd diffget and update
" dm diffget from merge
" dn diff next
" dp diff prev
" dt diffget from target
+" du diffput and update
" D |
" e | CtrlP buffer
" E |
@@ -152,19 +154,21 @@ noremap <leader>bp :bp<CR>
noremap <leader>bl :ls<CR>
noremap <leader>bt :b#<CR>
noremap <leader>dd :only<CR>
+noremap <leader>dg :diffget<CR>:diffupdate<CR>
noremap <leader>dm :diffget //3<CR>:diffupdate<CR>
noremap <leader>dn ]c
noremap <leader>dp [c
noremap <leader>dt :diffget //2<CR>:diffupdate<CR>
+noremap <leader>du :diffput<CR>:diffupdate<CR>
noremap <leader>e :CtrlPBuffer<CR>
noremap <leader>ft Vatzf
noremap <leader>ga :Gcommit --amend<CR>
noremap <leader>gb :Git branch<CR>
-noremap <leader>gc :Gcommit<CR>
noremap <leader>gd :Gdiff<CR>
noremap <leader>gw :Gwrite<CR>
exe 'noremap <leader>go :Git checkout '
noremap <leader>gs :Gstatus<CR>
+noremap <leader>gu :Git push origin master
noremap <leader>h :set list!<CR>
noremap <leader>ll :LongLineToggle<CR>
noremap <leader>ln :LongLineNext<CR>

0 comments on commit a609f2d

Please sign in to comment.
Something went wrong with that request. Please try again.