feat: git config main branch and delta config

This commit is contained in:
Joe Fleming
2026-03-07 11:25:20 -07:00
parent 4dd974484f
commit 6748e2ee7b

View File

@@ -1,6 +1,24 @@
# be sure to install delta and vim
[user]
[init]
defaultBranch = main
[core]
pager = delta
[editor]
vim
[diff]
[color]
ui = auto
[merge]
tool = vimdiff
ff = true
[push]
default = current
followTags = true
[branch]
autosetuprebase = always
[rebase]
autosquash = true
[alias]
st = status
bi = bisect
@@ -20,7 +38,7 @@
gnc = goodness --cached
fa = fetch --all
pom = push origin master
b = "!git for-each-ref --sort=-committerdate refs/heads --format='%(authordate:short) %(color:yellow)%(refname:short) %(color:red)%(objectname:short) %(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))'"
b = "!git for-each-ref --sort=-committerdate refs/heads --format='%(authordate:short) %(color:red)%(objectname:short) %(color:yellow)%(refname:short)%(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))'"
ll = log --pretty='%C(yellow)%h %C(cyan)%cd %Cblue%aN%C(auto)%d %Creset%s' --graph --date=relative --topo-order --decorate
ds = diff --stat=160,120
dh1 = diff HEAD~1
@@ -31,19 +49,19 @@
r = !git l -30
ra = !git r --all
rs = !git log --oneline --show-signature
l = "!source ~/.githelpers && pretty_git_log"
l = "!. ~/.githelpers && pretty_git_log"
la = !git l --all
sync = "!source ~/.githelpers && sync_to_remote"
bsync = "!source ~/.githelpers && update_branch"
sync = "!. ~/.githelpers && sync_to_remote"
bsync = "!. ~/.githelpers && update_branch"
bp = !git backport
backport = "!source ~/.githelpers && backport_pr"
track = "!source ~/.githelpers && track_remote"
backport = "!. ~/.githelpers && backport_pr"
track = "!. ~/.githelpers && track_remote"
sign = "!git commit -S --amend --no-edit"
todo = grep --heading --break --ignore-case -e ' FIX: *' -e ' TODO: *'
pr = "!source ~/.githelpers && get_pr"
prx = "!source ~/.githelpers && del_pr"
brx = "!source ~/.githelpers && clean_branches"
pr = "!. ~/.githelpers && get_pr"
prx = "!. ~/.githelpers && del_pr"
brx = "!. ~/.githelpers && clean_branches"
lbr = for-each-ref --sort='-committerdate:iso8601' --format=' %(committerdate:iso8601)%09%(refname)' refs/heads
snc = "!source ~/.githelpers && create_snap"
sna = "!source ~/.githelpers && apply_snap"
@@ -51,13 +69,16 @@
snS = "!source ~/.githelpers && show_snap"
snr = "!source ~/.githelpers && revert_snap"
snx = "!source ~/.githelpers && remove_snap"
[merge]
tool = vimdiff
ff = true
[push]
default = current
followTags = true
[branch]
autosetuprebase = always
[rebase]
autosquash = true
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
#dark = true # or light = true, or omit for auto-detection
detect-dark-light = true
side-by-side = true
line-numbers = true
hunk-header-style = file line-number syntax
hunk-header-file-style = cyan
hunk-header-line-number-style = yellow
hunk-header-decoration-style = box
diff-so-fancy = false