Le Thu, May 26, 2011 at 08:08:20AM +0200, Alex Mestiashvili a écrit : > > Would it be possible just to roll back to latest commit done by you > , and start over from that point with my changes and the new > upstream 1.0.2 ? Yes, this is something that I was considering: recover your changes with git-format-patches, reset (--hard) to the latest clean commit, and apply the relevant patches with git am. Cheers, -- Charles