mirror of
https://github.com/kastdeur/dotfiles.git
synced 2024-12-22 01:03:35 +01:00
44 lines
1.2 KiB
Text
44 lines
1.2 KiB
Text
# This is Git's per-user configuration file.
|
|
[user]
|
|
name = Eric Teunis de Boone
|
|
email = ericteunis@deboone.nl
|
|
[gui]
|
|
editor = geany
|
|
[push]
|
|
default = matching
|
|
[core]
|
|
excludesfile = ~/.config/git/ignore
|
|
attributesfile = ~/.config/git/attributes
|
|
[color]
|
|
ui = auto
|
|
[color "status"]
|
|
# use different color than untracked and unmerged paths have
|
|
changed = yellow
|
|
[merge]
|
|
conflictstyle = diff3
|
|
[branch]
|
|
autosetuprebase = always
|
|
[diff]
|
|
mnemonicPrefix = true
|
|
tool = vimdiff
|
|
[diff "pandoc"]
|
|
textconv = pandoc --to=rst
|
|
[diff "pdf"]
|
|
textconv = pdf2txt
|
|
[alias]
|
|
# Short Fancy Logs
|
|
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)'
|
|
lg = !"git lg1"
|
|
lga = !"git lg --all"
|
|
|
|
s = status --short
|
|
st = status
|
|
|
|
pushf = push --force-with-lease # Look mom, no --force
|
|
|
|
dif = diff
|
|
diffc = diff --cached
|
|
difc = diff --cached
|
|
|
|
alias = "! git config --get-regexp ^alias\\. "
|