personal dotfiles: my Hyprland config
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig34
1 files changed, 8 insertions, 26 deletions
diff --git a/.gitconfig b/.gitconfig
index e375392..3a514eb 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,44 +2,26 @@
name = Zach DeCook
email = zach.decook@bettercarpeople.com
[alias]
- ds = diff --staged
s = status
+ ds = diff --staged
uncommit = reset --soft HEAD~1
- ndiff = !git --no-pager diff
- grepn = grep -n
recommit = commit -C 'HEAD@{1}'
+ grepn = grep -n
mod = !git diff HEAD --relative | diff-so-fancy | grep \"@.*@\" | cut -d\" \" -f2 | grep -v \"^$\" | grep -v \"*\" | uniq:
-
+ ndiff = !git --no-pager diff
+ ddiff = -c diff.external=difft -c core.pager="less" diff
+ git = !git
+ gerp = grep
[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
+[advice]
+ statusHints = false