diff --git a/_bashrc b/_bashrc index 8df07de..c81b73c 100644 --- a/_bashrc +++ b/_bashrc @@ -107,8 +107,13 @@ fi if [ -e /usr/local/share/git-core/contrib/completion/git-completion.bash ]; then . /usr/local/share/git-core/contrib/completion/git-completion.bash fi -if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ]; then - . /usr/local/share/git-core/contrib/completion/git-prompt.sh +if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ] || [ -e /usr/lib/git-core/git-sh-prompt ]; then + if [ -e /usr/lib/git-core/git-sh-prompt ]; then + . /usr/lib/git-core/git-sh-prompt + fi + if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ]; then + . /usr/local/share/git-core/contrib/completion/git-prompt.sh + fi export GIT_PS1_SHOWDIRTYSTATE=1 export GIT_PS1_SHOWSTASHSTATE=1 export GIT_PS1_SHOWUNTRACKEDFILES=1 diff --git a/_vimrc b/_vimrc index 0f8842f..cc8afb4 100644 --- a/_vimrc +++ b/_vimrc @@ -100,8 +100,8 @@ nnoremap w :w " quit nnoremap q :q " navigate buffers -nnoremap h :bn -nnoremap l :bp +nnoremap l :bn +nnoremap h :bp " copy/paste system clipboard vmap y "+y vmap d "+d