Cool. I also wrote a vim plugin to do stuff like cycling between keywords. There is already a gitrebase filetype to hook it to as well.

https://github.com/mjbrownie/swapit