Update Git aliases and vimrc

This commit is contained in:
Rob Watson 2021-04-22 11:41:53 +02:00
parent 5e5fec58db
commit 570b8a5b5e
2 changed files with 3 additions and 1 deletions

View File

@ -16,7 +16,9 @@
ds = diff --staged ds = diff --staged
f = fetch f = fetch
fixup = rebase -i --autosquash fixup = rebase -i --autosquash
fixom = rebase -i --autosquash origin/master
mr = !git merge $(git rb) mr = !git merge $(git rb)
nb = checkout -b
nuke = reset --hard nuke = reset --hard
p = push p = push
poh = push -u origin HEAD poh = push -u origin HEAD

2
vimrc
View File

@ -155,7 +155,7 @@ function! OpenGitURLToLineOrRange() range
endif endif
endfunction endfunction
nnoremap <leader>ab :Gblame<cr> nnoremap <leader>ab :Git blame<cr>
nnoremap <leader>as :Gstatus<cr> nnoremap <leader>as :Gstatus<cr>
nnoremap <leader>ac :Commits<cr> nnoremap <leader>ac :Commits<cr>
nnoremap <leader>ah :GitGutterLineHighlightsToggle<cr> nnoremap <leader>ah :GitGutterLineHighlightsToggle<cr>