On Tuesday 31 August 2010 03:07:16 Miguel A. Figueroa-Villanueva wrote: > Hello. > > I recently made a commit to update the FindwxWidgets module > (6bbf2a0e8e983b193e48ad1b227c46cf6ea9a85b) > > However, after merging to next and pushing to cmake.git, I realized > that I had missed a few things. In this case I checked out the commit > were I left off, applied the changes, and committed again > (f51eb9cb0c3bc2a38f0c00780f0d8d050d00891f). It looks like this: > > ...o----o master > . \ > . o----o----o topic > . \ \ > ...o----o----o----o *next, origin/next > > Is this what should be done in such cases? Is there a way to signal > the first merge to next as one that should not be merged to master?
Normally git rebase origin/next is your friend to come back and get a nice o---o---o---o---o You can always stop a rebase with git rebase --abort. -- andreas _______________________________________________ cmake-developers mailing list cmake-developers@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers