git: whitespace
This commit is contained in:
parent
25b3fa0b7f
commit
6cff04d5fe
1 changed files with 22 additions and 23 deletions
45
.gitconfig
45
.gitconfig
|
@ -1,41 +1,40 @@
|
|||
[user]
|
||||
name = Michael Grote
|
||||
email = michael.grote@posteo.de
|
||||
name = Michael Grote
|
||||
email = michael.grote@posteo.de
|
||||
[credential]
|
||||
helper = store
|
||||
helper = store
|
||||
[alias]
|
||||
remote = remote -v
|
||||
remote = remote -v
|
||||
[core]
|
||||
autocrlf = input
|
||||
whitespace = blank-at-eol,space-before-tab,blank-at-eof
|
||||
autocrlf = input
|
||||
whitespace = blank-at-eol,space-before-tab,blank-at-eof
|
||||
[help]
|
||||
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
||||
autocorrect = 20 # https://opensource.com/article/20/11/git-aliases
|
||||
[status]
|
||||
showUntrackedFiles = all
|
||||
[push]
|
||||
default = simple
|
||||
default = simple
|
||||
[pull]
|
||||
rebase = true
|
||||
autostash = true
|
||||
rebase = true
|
||||
autostash = true
|
||||
[merge]
|
||||
conflictStyle = diff3
|
||||
autostash = true
|
||||
conflictStyle = diff3
|
||||
autostash = true
|
||||
[rebase]
|
||||
autostash = true
|
||||
autostash = true
|
||||
[diff]
|
||||
renames = true
|
||||
wsErrorHighlight = all
|
||||
renames = true
|
||||
wsErrorHighlight = all
|
||||
[fetch]
|
||||
prune = true
|
||||
prune = true
|
||||
[safe]
|
||||
directory = ~/dotfiles
|
||||
directory = ~/dotfiles
|
||||
[advice]
|
||||
addIgnoredFile = true
|
||||
addEmptyPathspec = false
|
||||
addIgnoredFile = true
|
||||
addEmptyPathspec = false
|
||||
[commit]
|
||||
verbose = true
|
||||
verbose = true
|
||||
[rerere]
|
||||
enabled = true
|
||||
enabled = true
|
||||
[diff]
|
||||
tool = vimdiff
|
||||
|
||||
tool = vimdiff
|
||||
|
|
Loading…
Reference in a new issue