dotfiles/home/.gitconfig

49 lines
906 B
INI

[user]
email = post@steffenvogel.de
name = Steffen Vogel
[github]
username = stv0g
[shell]
username = stv0g
[color]
ui = auto
[push]
default = simple
[core]
ignorecase = false
[merge]
tool = vimdiff
[diff]
tool = vimdiff
[rerere]
# Store and re-use manual conflict resolution changes.
enabled = 1
[core]
# Exclude everything this file. Used for general exclusions.
excludesfile = ~/.gitignore
# Set attributes on files. Used for general diff improvements.
attributesfile = ~/.gitattributes
[help]
# Open Git help pages in the browser as HTML.
format = web
autocorrect = 1
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[diff "xml"]
textconv = xmllint --format --recover