Skip to content

Instantly share code, notes, and snippets.

@coderek
Created April 11, 2016 12:07
Show Gist options
  • Save coderek/39b5d9b6df538d17b0eedaf0921e587d to your computer and use it in GitHub Desktop.
Save coderek/39b5d9b6df538d17b0eedaf0921e587d to your computer and use it in GitHub Desktop.
[alias]
co = checkout
l = log --no-merges --pretty=medium --branches=develop,HEAD
lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --no-merges --branches=develop,HEAD
s = status
last = log -1 HEAD
b = branch
br = branch -r
cb = checkout -b
ss = stash save
sl = stash list
sa = stash apply
cp = cherry-pick
df = diff --cached --word-diff=color
ps = push origin HEAD
f = fetch -a -p
dd = diff origin/develop HEAD --minimal
hash = log --author=coderek --no-merges --oneline
contains = branch --contains
changed = diff develop --name-only
x = commit -a
[user]
name = coderek
email = [email protected]
[core]
editor = vim
excludesfile = /Users/derekzeng/.gitignore_global
autocrlf = input
[push]
default = simple
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment