diff --git a/gitconfig b/gitconfig index 11ce7cd..7bca857 100644 --- a/gitconfig +++ b/gitconfig @@ -1,10 +1,13 @@ [init] defaultBranch = main templatedir = ~/.git_template + [push] default = current + [color] ui = auto + [alias] aa = add --all ap = add --patch @@ -19,21 +22,45 @@ cleanup = "!git branch --merged | egrep -v \"(\\*|master|main|dev|develop)\" | xargs -r git branch -d" history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit ignore = update-index --assume-unchanged + [user] email = __[email]__ name = __[name]__ signingkey = __[signing_key]__ + [url "git@github.com:"] insteadOf = https://github.com + [core] excludesfile = ~/.gitignore + pager = delta + [fetch] prune = true + [rebase] autosquash = true + [diff] colorMoved = zebra + [commit] gpgSign = true + [sequence] editor = interactive-rebase-tool + +[interactive] + diffFilter = delta --color-only + +[delta] + navigate = true + light = false + line-numbers = true + side-by-side = true + +[merge] + conflictstyle = diff3 + +[diff] + colorMoved = default