diff options
| author | Zach DeCook <zach.decook@bettercarpeople.com> | 2023-06-27 20:00:54 -0400 |
|---|---|---|
| committer | Zach DeCook <zach.decook@bettercarpeople.com> | 2023-06-27 20:00:54 -0400 |
| commit | 9f6f29edf5d43826ef283dcba89f5aefe93430ef (patch) | |
| tree | c05d2d5dfeefd90b538483e1bda453cc11b01fb4 /.gitconfig | |
| parent | 368e163aeb3e10a48d124924cb2f8c38b2b5ab98 (diff) | |
| download | dotfiles-9f6f29edf5d43826ef283dcba89f5aefe93430ef.tar.gz | |
changes: yeah
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig index 8fb78fd..e375392 100644 --- a/.gitconfig +++ b/.gitconfig @@ -9,12 +9,37 @@ grepn = grep -n recommit = commit -C 'HEAD@{1}' mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq: + [core] pager = diff-so-fancy | less --tabs=4 -RFX + #pager = delta +[merge] + conflictstyle = diff3 +[diff] + colorMoved = default + [interactive] diffFilter = diff-so-fancy --patch + #diffFilter = delta --color-only +[add.interactive] + useBuiltin = false # required for git 2.37.0 + [sendemail] smtpserver = smtp.gmail.com smtpuser = zach.decook@bettercarpeople.com smtpencryption = tls smtpserverport = 587 +[color] + ui = true +[color "diff-highlight"] + oldNormal = red bold + oldHighlight = red bold 52 + newNormal = green bold + newHighlight = green bold 22 +[color "diff"] + #meta = yellow + #frag = magenta bold + #commit = yellow bold + old = red bold + new = green bold + whitespace = red reverse |