Skip to content

Instantly share code, notes, and snippets.

@melcloud
Created January 16, 2024 23:42
Show Gist options
  • Save melcloud/fc58d9818086e25933e8b080fe553a4a to your computer and use it in GitHub Desktop.
Save melcloud/fc58d9818086e25933e8b080fe553a4a to your computer and use it in GitHub Desktop.
My gitconfig
[pull]
ff = true
[mergetool]
KeepBackup = false
prompt = false
[alias]
gcg = config --global
co = checkout
cob = checkout -b
br = branch
st = status
ci = commit
ec = config --global -e
up = !git pull --rebase --prune $@ && git submodule update --init --recursive
unstage = reset HEAD --
cm = !git add -A && git commit -m
save = !git add -A && git commit -m 'SAVEPOINT'
wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
wip = !git add -u && git commit -mWIP
undo = reset HEAD~1 --mixed
amend = commit -a --amend
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
stash-list = stash list --pretty=format:'%Cblue%gd%Cred: %C(yellow)%s'q
d = difftool
m = mergetool
[merge]
tool = vimdiff3
conflictstyle = diff3
[diff]
tool = vimdiff3
conflictstyle = diff3
[difftool]
prompt = false
[gui]
fontdiff = -family Consolas -size 10 -weight normal -slant roman -underline 0 -overstrike 0
pruneduringfetch = true
recentrepo = /Users/yin.zhang/codes/work/cse-aws-ansible
recentrepo = /Users/yin.zhang/codes/work/idam-ui-regression-tests
recentrepo = /Users/yin.zhang/codes/work/idam-diagnostics
recentrepo = /Users/yin.zhang/codes/work/idam
[credential]
helper = osxkeychain
[interactive]
diffFilter = diff-highlight
[commit]
template = /Users/yin.zhang/git-message.txt
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[core]
pager = diff-so-fancy | less --tabs=4 -RFX
[color]
ui = true
[color "diff"]
meta = 227
frag = magenta bold
commit = 227 bold
old = red bold
new = green bold
whitespace = red reverse
[dotfiles]
lastupdate = 201710082101
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment