From 8b6e338fc212a77d604e03c58262f24c6917a114 Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Fri, 7 Feb 2025 16:41:59 +0100 Subject: [PATCH] git: Reformat config --- vcs/git/config/git/config | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/vcs/git/config/git/config b/vcs/git/config/git/config index 1bfc097..bec5b39 100644 --- a/vcs/git/config/git/config +++ b/vcs/git/config/git/config @@ -20,23 +20,23 @@ smtpserver = "/usr/bin/msmtp" annotate = yes [alias] - ignore = "!gitignore -f" + ignore = "!gitignore -f" # requires gitignore script to be in PATH last = "diff HEAD~ HEAD" - pushall = "!git remote | xargs -I R git push R" # push to all connected remotes - fetchall = "!git remote | xargs -I R git fetch R" # fetch from all connected remotes + pushall = "!git remote | xargs -I R git push R" # push to all connected remotes + 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 - delta = "![ $TERM_DARK = false ] && delta --light || delta" # Take care that we always display right color scheme + diffsyn = "!git difftool --tool difftastic" # add syntax-driven diff using treesitter + diffside = "!DELTA_FEATURES='+side-by-side' git diff" # add side-by-side diffing + delta = "![ $TERM_DARK = false ] && delta --light || delta" # Take care that we always display right color scheme [commit] - gpgsign = true # sign commits as me - verbose = true # Always show diff when preparing commit message + gpgsign = true # sign commits as me + verbose = true # Always show diff when preparing commit message [fetch] - prune = true # remove references to non-existent remote branches + prune = true # remove references to non-existent remote branches [pull] - rebase = true # always rebase on pulling, obviates merge commits + rebase = true # always rebase on pulling, obviates merge commits [diff] - colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color + colorMoved = zebra # also color stuff that has simply been moved, in a classy zebra-color [difftool] prompt = false [difftool "difftastic"]