Skip to content

Instantly share code, notes, and snippets.

@marc-hughes
Created May 16, 2016 11:47
Show Gist options
  • Save marc-hughes/2eed317db9cc187695bfb27c7bee9455 to your computer and use it in GitHub Desktop.
Save marc-hughes/2eed317db9cc187695bfb27c7bee9455 to your computer and use it in GitHub Desktop.
[alias]
cleanfeature = branch --merged | grep "feature/" | xargs -n 1 git branch -d
[merge]
tool = p4mergetool
renameLimit = 8000
[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
trustExitCode = false
[mergetool]
keepBackup = false
[diff]
tool = p4merge
[difftool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $LOCAL $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment