Create a gist now

Instantly share code, notes, and snippets.

name = Mihail Ryanzin
email =
signingkey = B58CD53D
excludesfile = /Users/mike/.gitignore_global
attributesfile = /Users/mike/.gitattributes
algorithm = patience
s = status
d = diff
dc = diff --cached
pr = pull --rebase
aa = add --all
ca = commit --amend -C HEAD
cm = commit -m
co = checkout
cob = checkout -b
pp = !git pull --rebase && git push
tool = meld
prompt = false
keepBackup = false
[mergetool "meld"]
trustExitCode = true
cmd = open -W -a Meld --args --auto-merge \"$PWD/$LOCAL\" \"$PWD/$BASE\" \"$PWD/$REMOTE\" --output=\"$PWD/$MERGED\"
gpgsign = true
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment