Skip to content

Instantly share code, notes, and snippets.

@rdpanek
Created May 31, 2014 07:42
Show Gist options
  • Save rdpanek/acd2c08dabeafcd4ddf8 to your computer and use it in GitHub Desktop.
Save rdpanek/acd2c08dabeafcd4ddf8 to your computer and use it in GitHub Desktop.
[user]
name = Radim Daniel Panek
email = [email protected]
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow bold
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = green bold
changed = cyan bold
untracked = green
[core]
excludesfile = /Users/rdpanek/.gitignore_global
editor = vim
[alias]
c = commit
ca = commit --amend
l = log --pretty=oneline --graph --color --abbrev-commit
s = status
a = add --all
b = branch
d = diff
dc = diff --cached
ch = checkout
chd = checkout develop
chm = checkout master
res = reset --hard HEAD
f = fetch
pur = pull rebase
[merge]
tool = opendiff
[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