Update git alias and improve vim windows detection

This commit is contained in:
Michael Campagnaro 2023-12-01 23:48:11 -05:00
parent 137efc71a6
commit 928cc915dd
2 changed files with 4 additions and 1 deletions

View File

@ -1269,7 +1269,7 @@ alias gpr='git pull --rebase'
alias gpt='git push --tags' alias gpt='git push --tags'
alias gpu='git push --set-upstream origin HEAD' alias gpu='git push --set-upstream origin HEAD'
alias gr='git reset' alias gr='git reset'
alias gr1='git reset HEAD^1' alias gr1='git reset HEAD^1; gl'
alias grb='git rebase --autostash' alias grb='git rebase --autostash'
alias grba='git rebase --abort' alias grba='git rebase --abort'
alias grbc='git rebase --continue' alias grbc='git rebase --continue'

3
.vimrc
View File

@ -30,6 +30,9 @@ fu! IsWindows()
if s:uname =~ "mingw" || s:uname =~ "msys" if s:uname =~ "mingw" || s:uname =~ "msys"
return 1 return 1
endif endif
if has("win64") || has("win32") || has("win16")
return 1
endif
return 0 return 0
endfu endfu