Re: Rebasing multiple branches at once

2017-01-01 Thread Jeff King
On Sat, Dec 31, 2016 at 06:40:33PM -0800, Junio C Hamano wrote: > What people seem to do is to teach the branch that ends with F that > its upstream is the local branch that ends with E, so that they can > be lazy when rebasing a branch that knows its upstream. I suspect > that you would end up

Re: Rebasing multiple branches at once

2017-01-01 Thread Johannes Sixt
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

Re: Rebasing multiple branches at once

2016-12-31 Thread Junio C Hamano
Mike Hommey writes: > 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' > What people seem to

Rebasing multiple branches at once

2016-12-31 Thread 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: