diff --git a/.aliases b/.aliases index 87a2913..52bdf47 100644 --- a/.aliases +++ b/.aliases @@ -1269,7 +1269,7 @@ alias gpr='git pull --rebase' alias gpt='git push --tags' alias gpu='git push --set-upstream origin HEAD' alias gr='git reset' -alias gr1='git reset HEAD^1' +alias gr1='git reset HEAD^1; gl' alias grb='git rebase --autostash' alias grba='git rebase --abort' alias grbc='git rebase --continue' diff --git a/.vimrc b/.vimrc index 3e69f66..0185072 100644 --- a/.vimrc +++ b/.vimrc @@ -30,6 +30,9 @@ fu! IsWindows() if s:uname =~ "mingw" || s:uname =~ "msys" return 1 endif + if has("win64") || has("win32") || has("win16") + return 1 + endif return 0 endfu