Appion

I hadn't seen this before tonight. For people who haven't used it before, you can merge invidivual files (rather than merging a commit) between branches with the "patch" flag:

//merging gautomatchForm from myami-gautomatch branch to trunk

//if you're not already in your trunk
git checkout trunk

git checkout --patch myami-gautomatch myamiweb/processing/inc/forms/gautomatchForm.inc

git commit -m "merging gautomatchForm from myami-gautomatch to trunk" 

git push

Source: http://stackoverflow.com/questions/18115411/how-to-merge-specific-files-from-git-branches