Skip to content

Instantly share code, notes, and snippets.

@oliyoung
Created March 22, 2017 01:23
Show Gist options
  • Star 14 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save oliyoung/91a829ea21550a7a7d9469220a7c2f73 to your computer and use it in GitHub Desktop.
Save oliyoung/91a829ea21550a7a7d9469220a7c2f73 to your computer and use it in GitHub Desktop.
gitconfig
[core]
excludesfile = ~/.gitignore_global
pager = diff-so-fancy | less --tabs=4 -RFX
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[alias]
aa = add --all
amend = commit --amend
assume = update-index --assume-unchanged
assumed = "!git ls-files -v | grep ^h | cut -c 3-"
br = branch
ci = commit
cl = clone
co = checkout
cp = cherry-pick
d = diff --word-diff --ignore-space-change --color-words --ignore-blank-lines
dc = diff --cached
dlc = diff --cached HEAD^
fl = log -u
graph = log --graph
tree = log --graph --pretty=format:'%C(yellow)%h%C(cyan)%d%Creset %s %C(white)- %an, %ar%Creset' --date=short
ll = log --stat --abbrev-commit
l = log --pretty=format:'%C(yellow)%h%Creset\t%C(green)%ai%Creset\t%C(blue)%an%Creset » %s %C(yellow)%d%Creset' --decorate --date=short
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
purr = pull --rebase
ready = rebase -i @{u}
m = merge
sa = stash apply
sl = stash list
snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
ss = stash save
st = status -sb
standup = log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cD) %C(bold blue)<%an>%Creset' --since yesterday
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
unassume = update-index --no-assume-unchanged
dfw = diff --ignore-space-change
[diff]
algorithm = patience
[push]
default = simple
[color]
ui = auto
interactive = auto
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[http]
postBuffer = 524288000
[filter "hawser"]
clean = git hawser clean %f
smudge = git hawser smudge %f
required = true
[filter "lfs"]
clean = git lfs clean %f
smudge = git lfs smudge %f
required = true
[color "diff"]
old = red strike
new = green italic
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment