diff --git a/.gitconfig b/.gitconfig index aa89bb6..f6a6f08 100644 --- a/.gitconfig +++ b/.gitconfig @@ -12,6 +12,23 @@ filemode = true eol = lf autocrlf = input + pager = delta + +[interactive] + diffFilter = delta --color-only + +[delta] + features = side-by-side line-numbers #decorations + whitespace-error-style = 22 reverse + syntax-theme = zenburn + +[delta "decorations"] + commit-decoration-style = bold yellow box ul + file-style = bold yellow ul + file-decoration-style = none + +[rebase] + autoStash = true [merge] tool = vimdiff @@ -19,7 +36,7 @@ prompt = false [pull] - rebase = true + rebase = true [color] branch = auto @@ -53,5 +70,3 @@ --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %C(green)(%ad) %C(bold cyan)<%an>%Creset' up = pull --rebase branches-last-updated = branch -rv --sort=committerdate --format='%(HEAD) %(color:green)%(committerdate:relative)%(color:reset)\t%(color:magenta)%(authorname)%(color:reset)\t%(color:yellow)%(refname:short)%(color:reset)' -[rebase] - autoStash = true