Merge branch 'master' of github.com:cyplo/dotfiles

This commit is contained in:
Cyryl Plotnicki-Chudyk 2014-11-29 11:25:59 +01:00
commit ac777bafd8
2 changed files with 2 additions and 1 deletions

View file

@ -10,6 +10,6 @@
[core] [core]
pager = cat pager = cat
[alias] [alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 6 tree = log --show-signature --color --decorate --date=short --all --graph -n 9
[mergetool] [mergetool]
keepBackup = false keepBackup = false

1
.vimrc
View file

@ -43,6 +43,7 @@ let g:airline#extensions#tabline#enabled = 1
" appearance " appearance
set number
set relativenumber set relativenumber
set laststatus=2 set laststatus=2
set noshowmode set noshowmode