Last active
October 3, 2018 23:21
-
-
Save ordovician/5629685 to your computer and use it in GitHub Desktop.
[Pretty git logs] Pretty logs in git and support for using sourcetree for merging. From https://coderwall.com/p/euwpig?i=3&p=1&t=git #git #config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[difftool "sourcetree"] | |
cmd = opendiff \"$LOCAL\" \"$REMOTE\" | |
[mergetool "sourcetree"] | |
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" | |
trustExitCode = true | |
[alias] | |
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment