Re: [PATCH 1/2] Documentation: new upstream rebase recovery section in git-rebase

From: Marcus Griep <marcus@griep.us>
Date: Sep 12, 2008, 01:15 UTC
Message-ID: <48C9C2A4.6070601@griep.us>
In-Reply-To: <1221147525-5589-2-git-send-email-trast@student.ethz.ch>

Thomas Rast wrote:

> +Now suppose the 'subsystem' maintainer decides to clean up his history
> +with an interactive rebase.  He edits commits A and D (marked with a
> +`*`), decides to remove D entirely and moves B to the front.  This
> +results in

Minor correction: -+with an interactive rebase. He edits commits A and D (marked with a ++with an interactive rebase. He edits commits A and C (marked with a

Show 10 quoted lines

> +To fix this, you have to manually transplant your own part of the
> +history to the new branch head.  Looking at `git log`, you should be
> +able to determine that three commits on 'topic' are yours.  Again
> +assuming you are already on 'topic', you can do
> +------------
> +    git rebase --onto subsystem HEAD~3
> +------------
> +to put things right.  Of course, this again ripples onwards:
> +'everyone' downstream from 'subsystem' will have to 'manually' rebase
> +all their work!

I like this documentation because it provides another clear case of how the '--onto' option is used.

-- 
Marcus Griep
GPG Key ID: 0x5E968152
——
http://www.boohaunt.net
את.ψο´