I was receiving messages in my git log with something like "Merge branch 'branchname' of /blah/blah into 'branchname'
Found this very helpful site and blurb on how to fix this.:
http://wiki.sourcemage.org/Git_Guide#Why_do_my_commit_emails_have_extra_.22Merge_branch_.27master.27.22_messages.3F
Basically, it talks about doing a rebase.
