On 06/20/2011 07:46 PM, Brad King wrote: > On 06/20/2011 12:40 PM, Alexander Neundorf wrote: > >> What is the recommended way how to do this with git ? >> >> Simply add one more commit which does that or do I have to do something with >> rebase --interactive ? >> How does that play together with the branch I already pushed ? Will this >> pushed branch get a new history ? > > As you guessed, interactive rebase is the correct approach. Since > you have not merged the topic you are free to overwrite it on the > topic stage. The old version of the history will be replaced with > the new version. It might feel funny the first time but it is nice > and easy once you get the idea. I use it all the time locally to > clean up and organize a topic into a logical series of changes > before pushing it out. > > -Brad
For this kind of work, I also like to use StGit. It is similar to Quilt, but makes full use of Git. Michael _______________________________________________ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
