Skip to content

Instantly share code, notes, and snippets.

@AArnott
Last active June 12, 2025 23:20
Show Gist options
  • Save AArnott/548c6103701890d1c0e2fd06fe3f9c32 to your computer and use it in GitHub Desktop.
Save AArnott/548c6103701890d1c0e2fd06fe3f9c32 to your computer and use it in GitHub Desktop.
[alias]
co = checkout
nb = checkout -b
b = branch
ci = commit
fix = commit --amend --no-edit
cp = cherry-pick
undo = reset --soft HEAD^
st = status
f = fetch origin
fu = fetch upstream
p = push origin -u HEAD
pf = push --force-with-lease
goback = reset --hard HEAD~1
clear = reset --hard
where = rev-parse HEAD
bd = branch -d
bdf = branch -D
alias = config --get-regexp ^alias\\.
ec = config --global -e
git = !exec git
out = log --branches --not --remotes --simplify-by-decoration --decorate --oneline
outk = !exec start gitk --branches --not --remotes
[core]
safecrlf = warn
preloadindex = true
fscache = true
autocrlf = true
editor = \"C:\\Users\\andarno\\AppData\\Local\\Programs\\Microsoft VS Code\\Code.exe\" --wait
symlinks = true
fsmonitor = true
sshCommand = C:/WINDOWS/System32/OpenSSH/ssh.exe
[push]
default = simple
[user]
email = [email protected]
name = Andrew Arnott
signingkey = 417F281ADD948890A7DE49FEF33A420C60ED9C6F
[diff]
tool = vsdiffmerge
guitool = vsdiffmerge
[difftool]
prompt = true
[difftool "vsdiffmerge"]
cmd = \"C:/Program Files/Microsoft Visual Studio/2022/IntPreview/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe\" \"$LOCAL\" \"$REMOTE\"
keepbackup = false
path = C:/Program Files/Microsoft Visual Studio/2022/IntPreview/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe
[merge]
tool = vsdiffmerge
guitool = vsdiffmerge
[mergetool]
prompt = true
[mergetool "vsdiffmerge"]
cmd = \"C:/Program Files/Microsoft Visual Studio/2022/IntPreview/Common7/IDE/CommonExtensions/Microsoft/TeamFoundation/Team Explorer/vsdiffmerge.exe\" \"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\" //m
trustexitcode = true
keepbackup = false
[rebase]
autoSquash = true
autoStash = false
[rerere]
enabled = true
[gui]
[fetch]
prune = true
[commit]
gpgsign = true
[pull]
rebase = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment