Skip to content

Instantly share code, notes, and snippets.

@erikeckhardt
Last active June 11, 2025 17:14
Show Gist options
  • Save erikeckhardt/de3cd3b1b558f50ac36b44307f35ed72 to your computer and use it in GitHub Desktop.
Save erikeckhardt/de3cd3b1b558f50ac36b44307f35ed72 to your computer and use it in GitHub Desktop.
git config
[branch]
autosetuprebase = always
[alias]
hist = log --color --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%cr)%C(bold blue) %an %Creset %G?' --abbrev-commit
hist2 = log --color --graph --pretty=format:'%Cred%h%Creset %C(yellow)%d%Creset %s %Cgreen(%ci)%C(bold blue) %an %Creset %G?' --abbrev-commit
ref = log --walk-reflogs --format='%C(auto)%h %Cgreen%gd %C(yellow)%d%Creset %gs' --date=iso
ref3 = log --walk-reflogs --date=iso --oneline
ref2 = reflog --format='%C(auto)%h %Cgreen%gd %C(yellow)%d%Creset %gs' -g @{now}
accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
stashs = "!f() { git diff \"$(git rev-parse stash@{${@:-0}})^\" \"$(git rev-parse stash@{${@:-0}})\"; }; f"
changes = diff-tree --no-commit-id --name-status -r
files = diff-tree --no-commit-id --name-only -r
list = ls-tree -r --name-only
amend = commit --amend --no-edit
amend-all = commit --amend --all --no-edit
test = "!f() { echo \"inside...\"; echo \"$@\" }; set -x; f"
each-branch = "!f() { git branch | tr '*' ' ' | xargs -I {} sh -c 'echo \"{}\";' }; set -x; f"
each-branch2 = "!f() { set -x; git branch | tr '*' ' ' | xargs -I {} sh -c 'echo \"{}\"; eval \"$@ {}\"'; }; f"
mr = !sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -
br = "for-each-ref --color=auto --format=\"%(color:green)%(committerdate:iso) %(color:reset)%(align:51)%(refname:lstrip=2)%(end) %(upstream)\" --sort=-authordate refs/heads"
fixssh = ssh -vvv [email protected]
[core]
trustctime = false
ignorecase = false
excludesfile = ~/.gitignore_global
[rerere]
enabled = true
[push]
default = simple
[pull]
rebase = true
[status]
showUntrackedFiles = all
[colors]
ui = true
[color "branch"]
upstream = blue black bold
[gc]
auto = 10240
[interactive]
singlekey = true
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[url "[email protected]:"]
insteadOf = https://github.com
[mergetool]
keepBackup = false
[diff]
algorithm = histogram
[init]
defaultBranch = master
[commit]
gpgsign = true
[stash]
showIncludeUntracked = true
[advice]
skippedCherryPicks = false
[gpg]
program = /opt/homebrew/bin/gpg
format = openpgp
[credential]
helper = osxkeychain
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment