Re: [PATCH v4 11/15] replay: use standard revision ranges
On Sun, Sep 10, 2023 at 5:20 AM Linus Arver <linusa@google.com> wrote:
Show 21 quoted lines
>
> Linus Arver <linusa@google.com> writes:
>
> >> +update refs/heads/branch1 ${NEW_branch1_HASH} ${OLD_branch1_HASH}
> >> +update refs/heads/branch2 ${NEW_branch2_HASH} ${OLD_branch2_HASH}
> >> +update refs/heads/branch3 ${NEW_branch3_HASH} ${OLD_branch3_HASH}
> >> +------------
> >> +
> >> +This will simultaneously rebase branch1, branch2, and branch3 -- all
> >> +commits they have since base, playing them on top of origin/main.
> >
> > How about
> >
> > This will rebase the commits in `branch1`, `branch2`, and `branch3`
> > (excluding those in `base`), preplaying them on top of `origin/main`.
>
> Oops, I meant "replaying" not "preplaying". But also, perhaps the
> following is simpler?
>
> This will replay the commits in `branch1`, `branch2`, and `branch3`
> (excluding those in `base`), on top of `origin/main`.Here also I prefer to keep "rebase".