2016-08-20 09:20:59 +01:00
|
|
|
[user]
|
2020-06-15 14:24:37 +01:00
|
|
|
name = Cyryl Płotnicki
|
|
|
|
|
email = cyplo@cyplo.net
|
2016-08-20 09:20:59 +01:00
|
|
|
[color]
|
2020-06-15 14:24:37 +01:00
|
|
|
ui = true
|
2016-08-20 09:20:59 +01:00
|
|
|
[help]
|
2020-06-15 14:24:37 +01:00
|
|
|
autocorrect = 1
|
2016-08-20 09:20:59 +01:00
|
|
|
[push]
|
2020-06-15 14:24:37 +01:00
|
|
|
default = simple
|
2016-08-20 09:20:59 +01:00
|
|
|
[core]
|
2020-06-15 14:24:37 +01:00
|
|
|
pager = cat
|
2016-08-20 09:20:59 +01:00
|
|
|
[alias]
|
2020-06-15 14:24:37 +01:00
|
|
|
tree = log --show-signature --color --decorate --date=short --all --graph -n 3
|
|
|
|
|
parent = log --pretty=%P -n 1
|
|
|
|
|
newbranch = !git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b "$2"
|
|
|
|
|
head = log HEAD -n1
|
|
|
|
|
signedcommit = !git commit -S
|
2016-08-20 09:20:59 +01:00
|
|
|
[core]
|
2020-06-15 14:24:37 +01:00
|
|
|
autocrlf = false
|
2016-08-20 09:20:59 +01:00
|
|
|
[diff]
|
2020-06-15 14:24:37 +01:00
|
|
|
tool = vimdiff
|
2016-08-20 09:20:59 +01:00
|
|
|
[difftool]
|
2020-06-15 14:24:37 +01:00
|
|
|
prompt = false
|
2016-08-20 09:20:59 +01:00
|
|
|
[difftool "vimdiff"]
|
2020-06-15 14:24:37 +01:00
|
|
|
cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
|
2016-08-20 09:20:59 +01:00
|
|
|
[merge]
|
2020-06-15 14:24:37 +01:00
|
|
|
tool = kdiff3
|
2016-08-20 09:20:59 +01:00
|
|
|
[mergetool]
|
2020-06-15 14:24:37 +01:00
|
|
|
keepBackup = false
|
2019-03-26 10:07:03 +00:00
|
|
|
[pager]
|
2020-06-15 14:24:37 +01:00
|
|
|
diff = diff-so-fancy | less --tabs=1,5 -RFX
|
|
|
|
|
show = diff-so-fancy | less --tabs=1,5 -RFX
|
2016-10-16 16:33:21 +01:00
|
|
|
[filter "lfs"]
|
2020-06-15 14:24:37 +01:00
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
|
required = true
|
