Skip to content

Instantly share code, notes, and snippets.

@dmitriid
Created Jul 4, 2013
Embed
What would you like to do?
[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
bug = !git rev-parse --abbrev-ref HEAD | sed 's/.*\\(\\<[[:alpha:]]\\+\\>\\)\\-\\(\\<[[:digit:]]\\+\\>\\).*/\\1-\\2/g' | cat
mm = !git commit -m \"`git bug` $1\" ${@:2} && :
[user]
name = Dmitrii Dimandt
email = dmitrii.dimandt@klarna.com
[merge]
tool = diffmerge
[mergetool "diffmerge"]
cmd = diffmerge --merge\n--result=$MERGED $LOCAL $BASE $REMOTE
trustExitCode = true
[mergetool]
keepBackup = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment