Am 31.12.2016 um 09:14 schrieb Mike Hommey:
Hi,
I've had this kind of things to do more than once, and had to do it a
lot today, so I figured it would be worth discussing whether git-rebase
should be enhanced to support this, or if this should go in a separate
tool or whatever.
So here is what I'm trying to do in a not-too painful way:
I'm starting with something like this:
A---B---C---D---E
\---F
where A is master, and E and F are two local topics with a common set of
things on top of master.
The next thing that happens is that master is updated, and I want to
rebase both topics on top of the new master.
So I now have:
A---G
\---B---C---D---E
\---F
If I do the dumb thing, which is to do `git rebase master E` and `git
rebase master F`, I end up with:
A---G---B'---C'---D'---E'
\---B"---C"---D"---F'
That is, I just lost the fast that E and F had common history.
Git garden shears, perhaps?
https://public-inbox.org/git/alpine.DEB.2.20.1609111027330.129229@virtualbox/
-- Hannes