Merge branch 'master' of gitlab.meutel.net:meutel/dotfiles

This commit is contained in:
Meutel 2016-05-24 21:07:32 +02:00
commit 1f91c9970d
2 changed files with 9 additions and 4 deletions

View File

@ -107,8 +107,13 @@ fi
if [ -e /usr/local/share/git-core/contrib/completion/git-completion.bash ]; then if [ -e /usr/local/share/git-core/contrib/completion/git-completion.bash ]; then
. /usr/local/share/git-core/contrib/completion/git-completion.bash . /usr/local/share/git-core/contrib/completion/git-completion.bash
fi fi
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 if [ -e /usr/local/share/git-core/contrib/completion/git-prompt.sh ]; then
. /usr/local/share/git-core/contrib/completion/git-prompt.sh . /usr/local/share/git-core/contrib/completion/git-prompt.sh
fi
export GIT_PS1_SHOWDIRTYSTATE=1 export GIT_PS1_SHOWDIRTYSTATE=1
export GIT_PS1_SHOWSTASHSTATE=1 export GIT_PS1_SHOWSTASHSTATE=1
export GIT_PS1_SHOWUNTRACKEDFILES=1 export GIT_PS1_SHOWUNTRACKEDFILES=1

4
_vimrc
View File

@ -100,8 +100,8 @@ nnoremap <Leader>w :w<CR>
" quit " quit
nnoremap <Leader>q :q<CR> nnoremap <Leader>q :q<CR>
" navigate buffers " navigate buffers
nnoremap <Leader>h :bn<CR> nnoremap <Leader>l :bn<CR>
nnoremap <Leader>l :bp<CR> nnoremap <Leader>h :bp<CR>
" copy/paste system clipboard " copy/paste system clipboard
vmap <Leader>y "+y vmap <Leader>y "+y
vmap <Leader>d "+d vmap <Leader>d "+d