[alias] bw = blame -w -M c = commit commend = commit --amend --no-edit cc = commit --all --amend --no-edit ca = commit --all co = checkout cb = "!f() { git co `git log --until=\"$*\" -1 --format=%h`; } ; f" s = status --short d = diff dc = diff --cached l = log a = add addnw = !sh -c 'git diff -U0 -w --no-color --ignore-blank-lines "$@" | git apply --cached --ignore-whitespace --unidiff-zero -' af = add -f p = push dt = difftool mt = mergetool ss = show -1 --format=%B--stat sw = show -1 --format=%B--stat --word-diff=color whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short whatadded = log --diff-filter=A deleted = log --diff-filter=D --summary lg = log --graph --pretty=catppuccin --date=relative lgd = log --graph --pretty=catppuccin --date=default lgm = log --graph --pretty=catppuccin --date=relative --author=AUTHOR_EMAIL abbr = "!sh -c 'git rev-list --all | grep ^$1 | while read commit; do git --no-pager log -n1 --pretty=format:\"%H %ci %an %s%n\" $commit; done' -" refeature = "!f() { git co develop && git pull && git co $1 && git pull && git rebase develop; } ; f" ffmerge = "!f() { git refeature $1 && git co develop && git merge $1; } ; f" clearbranch = "!f() { git branch -d $1 && git push origin :$1; } ; f" please = push --force-with-lease undo = restore unstage = restore --staged wip = "for-each-ref --sort=authordate:iso8601 --color --format='%(color:#a6e3a1)%(authordate:relative)%09%(color:reset)%(refname:short)' refs/heads" [color] ui = always [core] pager = delta fileMode = true editor = vim autocrlf = false [interactive] diffFilter = delta --color-only [include] path = ~/.delta/themes.toml [delta] navigate = true dark = true line-numbers = true features = catppuccin-mocha [push] default = current [branch] autosetuprebase = remote [merge] tool = vimdiff guitool = gvimdiff conflictStyle = zdiff3 [mergetool] prompt = false [diff] tool = vimdiff guitool = gvimdiff [difftool] prompt = false [commit] gpgSign = true [tag] forceSignAnnotated = true [includeIf "gitdir:~/code/priv/**/*"] path = "~/.gitconfig-private" [includeIf "gitdir:~/.dotfiles"] path = "~/.gitconfig-private" [init] defaultBranch = main [credential "https://github.com"] helper = !/opt/homebrew/bin/gh auth git-credential [credential "https://gist.github.com"] helper = !/opt/homebrew/bin/gh auth git-credential [pretty] catppuccin = "tformat:%C(#f38ba8)%h%Creset %C(#f9e2af)%an%d%Creset %s [%N] %C(#a6e3a1)(%ar)%Creset"