diff --git a/gitconfig b/gitconfig index e75ddda..cf1c326 100644 --- a/gitconfig +++ b/gitconfig @@ -16,7 +16,9 @@ ds = diff --staged f = fetch fixup = rebase -i --autosquash + fixom = rebase -i --autosquash origin/master mr = !git merge $(git rb) + nb = checkout -b nuke = reset --hard p = push poh = push -u origin HEAD diff --git a/vimrc b/vimrc index e735cd6..7f2ac9c 100644 --- a/vimrc +++ b/vimrc @@ -155,7 +155,7 @@ function! OpenGitURLToLineOrRange() range endif endfunction -nnoremap ab :Gblame +nnoremap ab :Git blame nnoremap as :Gstatus nnoremap ac :Commits nnoremap ah :GitGutterLineHighlightsToggle