39 lines
663 B
Text
39 lines
663 B
Text
[user]
|
|
email = nikolasweger@googlemail.com
|
|
name = Nikolas Weger
|
|
|
|
[color]
|
|
ui = auto
|
|
|
|
[pretty]
|
|
line = "%C(auto)%h%d %s %C(yellow)by %C(blue)%an %C(green)%ar"
|
|
compact = "%C(auto)%h %s %C(green)%ar%n %C(auto)%d%n"
|
|
detail = "%C(auto)%h %s%n %C(yellow)by %C(blue)%an %C(magenta)<%ae> [%G?] %C(green)%ar%n %C(auto)%d%n"
|
|
|
|
[diff]
|
|
tool = meld
|
|
|
|
[difftool]
|
|
prompt = false
|
|
|
|
[difftool "meld"]
|
|
cmd = meld "$REMOTE" "$LOCAL"
|
|
|
|
[merge]
|
|
tool = meld
|
|
|
|
[mergetool "meld"]
|
|
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
|
|
|
|
[push]
|
|
default = upstream
|
|
|
|
[credential]
|
|
helper = cache --timeout=3600
|
|
|
|
[advice]
|
|
detachedHead = false
|
|
|
|
[core]
|
|
excludesfile = /etc/gitignore
|
|
editor = vim
|