On Thu, Aug 30, 2018 at 01:03:41PM +0200, Johannes Schindelin wrote:
> > Will replace by doing:
> >
> > $ git checkout js/rebase-in-c-5.5-work-with-rebase-i-in-c
> > $ git checkout HEAD^
> > $ git am -s mbox
> > $ git range-diff @{-1}...
> > $ git checkout -B @{-1}
> >
> > $ git checkout pk/rebase-i-in-c-6-final
> > $ git rebase --onto js/rebase-in-c-5.5-work-with-rebase-i-in-c \
> > js/rebase-in-c-5.5-work-with-rebase-i-in-c@{1} HEAD^0
> > $ git range-diff @{-1}...
> > $ git checkout -B @{-1}
> >
> > to update the two topics and then rebuilding the integration
> > branches the usual way. I also need to replace the "other" topic
> > used in this topic, so the actual procedure would be a bit more
> > involved than the above, though.
>
> Is there any reason why you avoid using `git rebase -ir` here? This should
> be so much easier via
>
> git checkout pk/rebase-i-in-c-6-final
> git rebase -ir js/rebase-in-c-5.5-work-with-rebase-i-in-c^
>
> and then inserting this at the appropriate position, followed by the `git
> range-diff @{-1}...`:
>
> git am -s mbox
> git update-ref js/rebase-in-c-5.5-work-with-rebase-i-in-c HEAD
Related discussion, including a fantasy tangent by me (downthread):
https://public-inbox.org/git/20180727080807.GA11932@xxxxxxxxxxxxxxxxxxxxx/#t
-Peff
