Hi, I just stumbled upon this app (I haven't tested it yet) which might be able to avoid some pain when editing git history before pushing your changes upstream: http://gitup.co Mojca