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