Merge branch 'master' into cucumber

This commit is contained in:
Cyryl Płotnicki 2016-08-20 11:43:12 +02:00 committed by GitHub
commit 497199a2b9
2 changed files with 32 additions and 29 deletions

View file

@ -1,5 +1,5 @@
[user]
name = Cyryl Płotnicki-Chudyk
name = Cyryl Płotnicki
email = cyplo@cyplo.net
[color]
ui = true
@ -10,7 +10,7 @@
[core]
pager = cat
[alias]
tree = log --show-signature --color --decorate --date=short --all --graph -n 9
tree = log --show-signature --color --decorate --date=short --all --graph -n 8
head = log HEAD -n1
[core]
autocrlf = false

3
.vimrc
View file

@ -79,6 +79,9 @@ Plugin 'Valloric/YouCompleteMe'
call vundle#end()
filetype plugin indent on
" line ending
set fileformats=unix,dos
" colours
set t_Co=256
syntax enable