From: Roy S. <roy...@ic...> - 2013-04-08 17:46:35
|
On Mon, 8 Apr 2013, Derek Gaston wrote: > You can just delete those merge commits. I would just do a "git rebase HEAD~4" (where 4 is 1 > beyond the number of commits you want to edit.. So for libmesh/roystgnr/master in place of "4" I would put... what? I think my first merge commit was Dec. 13, something like 500 commits ago... plus, some of those may have slipped back into libMesh/libmesh/master, in which case I presumably *wouldn't* want to delete them in my local copy. "wipe and restore from scratch" is sounding better and better, but I'm not even certain how to do that. --- Roy |