dtjm

### ~/.subversion/config
### Add this line to the [helpers] section

diff-cmd = ~/bin/svn-diffwrap.sh

lttlrck

git branch -m old_branch new_branch         # Rename branch locally    
git push origin :old_branch                 # Delete the old branch    
git push --set-upstream origin new_branch   # Push the new branch, set local branch to track the new remote

clops

#!/usr/bin/php
<?php
	/**
	 *  GIT Merge Helper
	 *
	 *  Installation:
	 *  1. Download / Clone this GIST https://gist.github.com/clops/3ac9cd6c42a66ba65101 into some directory
	 *  2. chmod a+x deploy.php
	 *  3. Add an alias into .bash_profile with a full path to the deploy.php script, mine is:
	 *          alias deploy="~/dev/3ac9cd6c42a66ba65101/deploy.php"