clean up gitignore
- Id
- 1df7fe103fa7d61fd29676b2633d5a5c123f7ade
- Author
- Caio
- Commit time
- 2023-07-27T08:35:01+02:00
Modified gitconfig
-# vim: noet:sw=8
[user]
name = Caio
email = contact@caio.co
fixup = commit --amend --no-edit
news = log --reverse --no-merges --stat @{1}..
-[core]
- whitespace = blank-at-eol,space-before-tab,tab-in-indent
- preloadindex = true
- excludesfile = ~/.gitignore
-
[color]
ui = auto
[merge]
tool = vimdiff
- conflictstyle = diff3
- prompt = false
[rebase]
stat = true
[diff]
noprefix = true
- wordRegex = [^[:space:]]
- compactionHeuristic = true
- algorithm = patience
- relative = true
-
-[difftool "nvim"]
- cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\"
-
[log]
decorate = short
[branch]
autosetuprebase = always
autosetupmerge = always
+
[commit]
verbose = true
[mergetool]
keepBackup = false
-[mergetool "nvimdiff"]
- cmd = nvim -d \"$LOCAL\" \"$MERGED\" \"$BASE\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd J\"
-
[init]
defaultBranch = main
+
[pull]
rebase = true
+
[fetch]
prune = true