diff --git a/git/.config/git/config b/git/.config/git/config index 10b6bd8..6e430d9 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -26,6 +26,7 @@ fetchall = "!git remote | xargs -I R git fetch R" # fetch from all connected remotes diffword = "!git diff --word-diff=color --word-diff-regex='[0-9A-Za-z_]+'" # word-wise diff, good for prose diffsyn = "!git difftool --tool difftastic" # add syntax-driven diff using treesitter + diffside = "!DELTA_FEATURES='+side-by-side' git diff" # add side-by-side diffing [commit] gpgsign = true # sign commits as me verbose = true # Always show diff when preparing commit message diff --git a/git/.config/sh/alias.d/git.sh b/git/.config/sh/alias.d/git.sh index 5e84cae..44dc57b 100644 --- a/git/.config/sh/alias.d/git.sh +++ b/git/.config/sh/alias.d/git.sh @@ -38,6 +38,12 @@ alias gdds='git diffword --staged' alias gi='git ignore' +# word-based diff (with custom word regex) +alias gdw='git diffword' +alias gdws='git diffword --staged' +# side-by-side diff +alias gdd='git diffside' +alias gdds='git diffside --staged' # syntax-based diff if exist difft; then alias gdy='git diffsyn'