Files
skel/dotfiles/gitconfig
David Tomaschik ef8543d135 New alias
2026-09-29 12:51:27 -07:00

121 lines
2.8 KiB
Plaintext

[user]
name = David Tomaschik
useConfigOnly = true
[core]
excludesfile = ~/.gitignore
editor = vim
whitespace = trailing-space,space-before-tab
pager = command -v delta >/dev/null 2>&1 && delta || less -eFiJM~ -j3
[color]
diff = auto
status = auto
[diff]
tool = vimdiff
colorMoved = default
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[alias]
st = status
last = log -1 HEAD
# Thanks to
# http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/
logs = log --pretty=format:"%C(yellow)%h%Cred%d %Creset%s%Cblue [%cn]" --decorate
lg = log -p
ll = log --pretty=format:"%C(yellow)%h%Cred%d %Creset%s%Cblue [%cn]" --decorate --numstat
files = ls-files
ls = ls-files
lol = log --graph --pretty=format:'%C(yellow)%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cblue(%cr)%Creset' --abbrev-commit --date=relative
f = "!git ls-files | grep -i"
logtree = log --graph --oneline --decorate --all
list-squashed = "!f() { target=${1:-main}; current=$(git branch --show-current); git fetch --prune &>/dev/null; git for-each-ref refs/heads/ --format=\"%(refname:short)\" | while read b; do if [ \"$b\" != \"$target\" ] && [ \"$b\" != \"$current\" ]; then mb=$(git merge-base \"$target\" \"$b\" 2>/dev/null); if [ -n \"$mb\" ] && [[ $(git cherry \"$target\" $(git commit-tree \"$b^{tree}\" -p \"$mb\" -m temp 2>/dev/null) 2>/dev/null) == \"-\"* ]]; then echo \"💡 [Squash-Merged] $b\"; fi; fi; done; }; f"
[push]
default = current
autoSetupRemote = true
[web]
browser = chrome
[github]
user = matir
# Site specific config
[url "https://github.com/"]
insteadOf = "github:"
insteadOf = "github://"
[url "ssh://git@github.com/"]
pushInsteadOf = "github:"
pushInsteadOf = "github://"
pushInsteadOf = "https://github.com/"
[url "git://gist.github.com/"]
insteadOf = "gist:"
[url "git@gist.github.com:"]
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
[credential]
helper = cache --timeout=36000
[receive]
denyCurrentBranch = updateInstead
[merge]
tool = vimdiff
conflictstyle = diff3
[mergetool]
prompt = false
[pull]
rebase = false
[init]
defaultBranch = main
[interactive]
diffFilter = command -v delta >/dev/null 2>&1 && delta || cat
[delta]
navigate = true
line-numbers = true
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
[include]
path = ~/.gitconfig.d/aliases
path = ~/.gitconfig.d/google
path = ~/.gitconfig.d/override
path = ~/.gitconfig.d/local
[includeIf "gitdir/i:~/personal/"]
path = ~/.gitconfig.d/personal
[rerere]
enabled = true
[lfs]
concurrenttransfers = 3
[lfs "customtransfer.xet"]
path = git-xet
args = transfer
concurrent = true
[branch]
autoSetupMerge = simple