cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into cucumber

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

58
.gitconfig_includes.common
View file

@ -1,29 +1,29 @@
[user] [user]
name = Cyryl Płotnicki-Chudyk name = Cyryl Płotnicki
email = cyplo@cyplo.net email = cyplo@cyplo.net
[color] [color]
ui = true ui = true
[help] [help]
autocorrect = 1 autocorrect = 1
[push] [push]
default = simple default = simple
[core] [core]
pager = cat pager = cat
[alias] [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 head = log HEAD -n1
[core] [core]
autocrlf = false autocrlf = false
[diff] [diff]
tool = vimdiff tool = vimdiff
[difftool] [difftool]
prompt = false prompt = false
[difftool "vimdiff"] [difftool "vimdiff"]
cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off' cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge] [merge]
tool = kdiff3 tool = kdiff3
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[pager] [pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX show = diff-so-fancy | less --tabs=1,5 -RFX

3
.vimrc
View file

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