On Thu, 9 Aug 2012, Curtis Olson wrote: > It looks like every time you rebase you have to reapply the same set of > patches over top the target branch. So even if I figure out a way through > it once, I'll have to repeat the same conconction of craziness each time I > rebase. I think I'm going to create a new branch, untar my changes on top, > lose all my history and forget about it. I didn't budget 2 full days to > fiddle with this and I'm frustrated and annoyed now and unsure > what/if/anything I've lost or broken -- blahhh ... little things you might > not notice for 6 months because you don't work with every file every day ...
If you can figure out which commits cause the problems you can edit them out of your branch (or, better, out of a copy of it) using git rebase -i HEAD~42 (change 42 to the number of commits back from HEAD that you need to touch). See also the manual page for git rebase and http://git-scm.com/book/en/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://gitorious.org/anders-hangar http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
