dotfiles/.gitconfig
Michael Grote 666cc8b661 git: difftool
Signed-off-by: Michael Grote <michael.grote@dataport.de>
2024-03-18 09:34:11 +01:00

41 lines
844 B
INI

[user]
name = Michael Grote
email = michael.grote@posteo.de
[credential]
helper = store
[alias]
remote = remote -v
[core]
autocrlf = input
whitespace = blank-at-eol,space-before-tab,blank-at-eof
[help]
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
[status]
showUntrackedFiles = all
[push]
default = simple
[pull]
rebase = true
autostash = true
[merge]
conflictStyle = diff3
autostash = true
[rebase]
autostash = true
[diff]
renames = true
wsErrorHighlight = all
[fetch]
prune = true
[safe]
directory = ~/dotfiles
[advice]
addIgnoredFile = true
addEmptyPathspec = false
[commit]
verbose = true
[rerere]
enabled = true
[diff]
tool = vimdiff