~cyplo/dotfiles

ccd43633e6a1255839026b2cd20821eeb4ce71db — Cyryl Płotnicki 5 years ago 18529d2 + 7465c84
Merge pull request #27 from cyplo/normalize_gitconfig

Normalize gitconfig
2 files changed, 32 insertions(+), 29 deletions(-)

M .gitconfig_includes.common
M .vimrc
M .gitconfig_includes.common => .gitconfig_includes.common +29 -29
@@ 1,29 1,29 @@
[user]
	name = Cyryl Płotnicki-Chudyk
	email = cyplo@cyplo.net
[color]
	ui = true
[help]
	autocorrect = 1
[push]
	default = simple
[core]
	pager = cat
[alias]
    tree = log --show-signature --color --decorate --date=short --all --graph -n 9
    head = log HEAD -n1
[core]
    autocrlf = false
[diff]
    tool = vimdiff
[difftool]
    prompt = false
[difftool "vimdiff"]
    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge]
    tool = kdiff3
[mergetool]
	keepBackup = false
[pager]
    diff = diff-so-fancy | less --tabs=1,5 -RFX
    show = diff-so-fancy | less --tabs=1,5 -RFX
[user]
    name = Cyryl Płotnicki
    email = cyplo@cyplo.net
[color]
    ui = true
[help]
    autocorrect = 1
[push]
    default = simple
[core]
    pager = cat
[alias]
    tree = log --show-signature --color --decorate --date=short --all --graph -n 8
    head = log HEAD -n1
[core]
    autocrlf = false
[diff]
    tool = vimdiff
[difftool]
    prompt = false
[difftool "vimdiff"]
    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
[merge]
    tool = kdiff3
[mergetool]
    keepBackup = false
[pager]
    diff = diff-so-fancy | less --tabs=1,5 -RFX
    show = diff-so-fancy | less --tabs=1,5 -RFX

M .vimrc => .vimrc +3 -0
@@ 78,6 78,9 @@ Plugin 'Valloric/YouCompleteMe'
call vundle#end()
filetype plugin indent on

" line ending
set fileformats=unix,dos

" colours
set t_Co=256
syntax enable