2016-10-02 23:39:11 +02:00
|
|
|
# This is Git's per-user configuration file.
|
2016-09-26 15:40:04 +02:00
|
|
|
[user]
|
|
|
|
|
name = Eric Teunis de Boone
|
2020-04-14 17:15:27 +02:00
|
|
|
email = ericteunis@deboone.nl
|
2016-10-02 23:39:11 +02:00
|
|
|
[gui]
|
|
|
|
|
editor = geany
|
2016-09-26 15:40:04 +02:00
|
|
|
[push]
|
|
|
|
|
default = matching
|
2016-10-05 01:59:04 +02:00
|
|
|
[core]
|
2020-04-16 20:42:52 +02:00
|
|
|
excludesfile = ~/.config/git/ignore
|
2016-10-12 10:27:01 +02:00
|
|
|
[color]
|
|
|
|
|
ui = auto
|
2022-03-30 18:24:23 +02:00
|
|
|
[color "status"]
|
|
|
|
|
# use different color than untracked and unmerged paths have
|
|
|
|
|
changed = yellow
|
2016-10-30 00:09:14 +02:00
|
|
|
[merge]
|
|
|
|
|
conflictstyle = diff3
|
2017-08-26 13:30:58 +02:00
|
|
|
[branch]
|
|
|
|
|
autosetuprebase = always
|
|
|
|
|
[diff]
|
2022-03-30 18:12:24 +02:00
|
|
|
mnemonicPrefix = true
|
2017-08-26 13:30:58 +02:00
|
|
|
tool = vimdiff
|
2022-03-30 18:12:24 +02:00
|
|
|
[diff "rst"]
|
|
|
|
|
textconv = pandoc --to=rst
|
|
|
|
|
[diff "pdf"]
|
|
|
|
|
textconv = pdf2txt
|
2018-04-07 08:31:16 +02:00
|
|
|
[alias]
|
2020-05-04 19:21:59 +02:00
|
|
|
# Short Fancy Logs
|
2021-06-04 14:17:18 +02:00
|
|
|
lg1 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)'
|
|
|
|
|
lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
|
2020-05-04 19:21:59 +02:00
|
|
|
lg = !"git lg1"
|
2021-06-04 14:17:18 +02:00
|
|
|
lga = !"git lg --all"
|
2020-05-04 19:21:59 +02:00
|
|
|
|
2022-03-30 18:26:04 +02:00
|
|
|
s = status --short
|
|
|
|
|
st = status
|
|
|
|
|
|
|
|
|
|
pushf = push --force-with-lease # Look mom, no --force
|
|
|
|
|
|
2020-05-04 19:21:59 +02:00
|
|
|
dif = diff
|
2022-03-30 18:26:04 +02:00
|
|
|
diffc = diff --cached
|
|
|
|
|
difc = diff --cached
|
|
|
|
|
|
2021-06-04 14:17:18 +02:00
|
|
|
alias = "! git config --get-regexp ^alias\\. "
|
