2015-09-09 20:12:29 +02:00
|
|
|
[user]
|
2020-01-02 13:24:17 +01:00
|
|
|
email = felix.vanderjeugt@posteo.net
|
2016-04-26 17:11:16 +02:00
|
|
|
name = Felix Van der Jeugt
|
2017-01-19 17:00:48 +01:00
|
|
|
signingkey = 68FF561137C38F9618E97339AF25A2C2862AA368
|
2015-09-09 20:12:29 +02:00
|
|
|
[pull]
|
|
|
|
|
rebase = true
|
2016-04-26 17:11:16 +02:00
|
|
|
[merge]
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
[push]
|
|
|
|
|
default = simple
|
2018-11-22 13:39:45 +01:00
|
|
|
followTags = true
|
2016-04-26 17:11:16 +02:00
|
|
|
[core]
|
|
|
|
|
excludesfile = ~/.config/gitignore
|
2017-01-19 17:00:48 +01:00
|
|
|
[gpg]
|
|
|
|
|
program = gpg2
|
|
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
2020-10-16 10:31:23 +02:00
|
|
|
[pager]
|
|
|
|
|
status = true
|
2017-05-18 09:53:57 +02:00
|
|
|
[alias]
|
2017-10-10 14:15:00 +02:00
|
|
|
pf = push --force-with-lease
|
2017-05-30 10:47:13 +02:00
|
|
|
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
2020-08-20 15:51:39 +02:00
|
|
|
ff = merge --ff-only @{upstream}
|
2018-11-22 13:39:45 +01:00
|
|
|
co = checkout
|
|
|
|
|
jn = merge --no-ff --log --edit
|
2020-10-16 10:31:23 +02:00
|
|
|
s = status -vv
|
2020-09-22 11:01:06 +02:00
|
|
|
[rebase]
|
|
|
|
|
autoSquash = true
|
2020-11-14 14:37:24 +01:00
|
|
|
[rerere]
|
|
|
|
|
enabled = true
|
