w33ble/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: git config main branch and delta config

Browse Source
This commit is contained in:
Joe Fleming
2026-03-07 11:25:20 -07:00
parent 4dd974484f
commit 6748e2ee7b
1 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
git/gitconfig
View File

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