Skip to content

Instantly share code, notes, and snippets.

@alexanderjeurissen
Last active August 29, 2015 13:57
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save alexanderjeurissen/9531777 to your computer and use it in GitHub Desktop.
Save alexanderjeurissen/9531777 to your computer and use it in GitHub Desktop.
#GistID:9531777
[user]
name = Alexander Jeurissen
email = alexanderjeurissen@gmail.com
[diff]
external = git_diff_wrapper
[pager]
diff =
[color]
ui = auto
[alias]
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --abbrev-commit --date=relative
lgo = log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %Cblue<%an>%Creset' --date=relative
d = diff
;branch navigation aliases
ch = checkout
b = branch
;rebase aliases
ri = rebase -i
r = rebase
rc = rebase --continue
ra = rebase --abort
rs = rebase --skip
;merge aliases
m = merge
mc = merge --continue
ma = merge --abort
; push/commit aliases
aa = add -A
unadd = reset HEAD
c = commit
p = push
; stash aliases
stash = stash -u
sp = stash pop
sb = stash branch
[merge]
tool = threesome
[mergetool "threesome"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
trustExitCode = true
# vim: set et :
[credential]
helper = cache --timeout=36000
[github]
user = alexanderjeurissen
[core]
excludesfile = /Users/alexander/.gitignore
editor = vim
[push]
default = simple
[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