On Thu, Aug 9, 2012 at 10:44 AM, Anders Gidenstam
<anders-...@gidenstam.org>wrote:
> 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
I appreciate all the suggestions, it is getting slightly more complicated
than I want to deal with today. :-) I did play with interactive git
rebase, but my brain overheated trying to imagine what happens and what
downstream breakage might occur if I skip a commit that involves renaming
directories? And then I'd still have to remember the exact sequence of
steps each time I did a new rebase. Apparently rebase doesn't quite do
what I expected it to do -- it catches you up, but later if you do another
rebase apparently it redoes all your changes from day 1 of your branch.
There is probably a good reason for doing it this way, but I was imagining
that a rebase was a one time operation and future rebases would be able to
start from where the previous one finished off. Maybe that doesn't make
any sense? I'm probably a bit confused in either case -- flightgear seems
to force you to jump into the deep end of the git pool right away. :-)
--
Curtis Olson:
http://www.atiak.com - http://aem.umn.edu/~uav/
http://www.flightgear.org - http://gallinazo.flightgear.org
------------------------------------------------------------------------------
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
