diff --git a/git/.gitconfig b/git/.gitconfig index d8ac7e3..1ad4c0a 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,19 +1,22 @@ [user] name = Andrew Davidson - email = andrew@amdavidson.com - signingkey = 17AF8F2A49CF25C6 + email = andrew@andr3w.net + signingkey = F1199FC0A76BB402 [color] ui = auto + [color "branch"] current = yellow reverse local = yellow - remote = green + remote = green + [color "diff"] meta = yellow bold frag = magenta bold old = red bold - new = green bold + new = green bold + [color "status"] added = yellow changed = green @@ -23,14 +26,18 @@ ui = true diff = auto status = auto - branch = auto + branch = auto + [color "diff"] - whitespace = red reverse + whitespace = red reverse + [core] whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol pager = delta + [alias] lg = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative" + [push] default = simple @@ -38,12 +45,15 @@ plus-color = "#012800" minus-color = "#340001" syntax-theme = Monokai Extended + [interactive] diffFilter = delta --color-only [commit] - gpgsign = false + gpgsign = true + [credential] - helper = store + helper = store + [init] defaultBranch = main