I'm not sure what you mean. I'm unable to rebase the HEAD of master into this branch, or this branch into the HEAD of master. I've tried countless times, but I'm not a git wizard.

The above commit comes from rebasing mitchell's commit to the HEAD of master at https://github.com/mitchellh/packer/commit/9b501b93d62e0188ae8da66dfe7c14bd74e7f716

and my rebase issues are not with that file anyway. See https://gist.github.com/rasa/7086767
https://gist.github.com/rasa/7086767 for a log of one of my many attempts at rebasing master.