Month: September 2018

How to set up free merge and diff tool (p4merge) for GIT

This is just a backup of this article as I found it very handy: https://gist.github.com/SeanSSDing/d56d8b8aa4c79a05939b9ad3a6a63c8f Install p4merge from perforce.com Add below to your .gitconfig [merge] keepBackup = false tool = p4merge [mergetool “p4merge”] cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge “\”$PWD/$BASE\”” “\”$PWD/$REMOTE\”” “\”$PWD/$LOCAL\”” “\”$PWD/$MERGED\”” keepTemporaries = false trustExitCode = false keepBackup = false [diff] tool = p4merge [difftool “p4merge”]…

Read the full article

Adding a command Alias to git

Imagine you wan to run: git log –all –graph –decorate –oneline But you don’t wan t to write all that each time but instead something shorter like “logh” Well you can add a “git alias” in this way: git config –global alias.logh “log –all –graph –decorate –oneline” Voila, go and try it out! just do…

Read the full article