From: Denton Liu <liu.denton@gmail.com>
To: Phil Hord <phil.hord@gmail.com>
Cc: phillip.wood@dunelm.org.uk, Junio C Hamano <gitster@pobox.com>,
Git <git@vger.kernel.org>
Subject: Re: [PATCH/RFC 0/2] rebase: add switches to control todo-list setup
Date: Mon, 22 Apr 2019 12:49:40 -0700 [thread overview]
Message-ID: <20190422194940.GA10592@dev-l> (raw)
In-Reply-To: <CABURp0pEB-3m=wbWsVc9C82d3Jf2UW4fXnsSZ+GnTHKWRJo0NQ@mail.gmail.com>
Hi Phil,
On Mon, Apr 22, 2019 at 12:20:29PM -0700, Phil Hord wrote:
> On Mon, Apr 22, 2019 at 12:16 PM Phil Hord <phil.hord@gmail.com> wrote:
> >
> > I have the same need. I plan to have some switch that invokes this
> > "in-place rebase" behavior so that git can choose the upstream for me
> > as `mergebase $sequence-edits`. In fact, I want to make that the
> > default for these switches, but that feels too surprising for the
> > rebase command. I plan to progress like this:
> >
> > # --in-place switch is not supported; manual upstream is given by user
> > git rebase --edit foo foo^
> >
> > # --in-place switch is added; now we can say this
> > git rebase --edit foo --in-place
>
> I originally CC'ed Denton on this thread because he recently added
> --keep-base. I initially hoped it would do something similar to
> --in-place, but on reading the patch discussion, I think it's for
> something different altogether. :-\ It's similar, though, in the
> same way that --fork-point is; which may be another way to say "not
> very."
You're correct, --keep-base is a little more explicit than your proposed
--in-place switch in that the former requires an upstream revision be
specified whereas yours implicitly finds the base using the
$sequence-edits. I suppose until --in-place is implemented, users could
always use explicitly specify the upstream branch, such as:
$ git rebase --edit foo --keep-base master
Anyway, I've been following along with the discussion and although there
are kinks to iron out, I like the general idea. Although I use fixup and
squash commits + rebase -i --keep-base for major branch polishing,
sometimes after the branch is mostly polished, there are a few
last-minute changes to be made. I think that your proposed solution
would also match my use-case nicely.
Thanks,
Denton
next prev parent reply other threads:[~2019-04-22 19:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 0:07 [PATCH/RFC 0/2] rebase: add switches to control todo-list setup Phil Hord
2019-04-22 0:07 ` [PATCH/RFC 1/2] rebase: add switches for drop, edit and reword Phil Hord
2019-04-22 0:07 ` [PATCH/RFC 2/2] rebase: add --break switch Phil Hord
2019-04-22 1:13 ` [PATCH/RFC 0/2] rebase: add switches to control todo-list setup Junio C Hamano
2019-04-22 14:44 ` Phillip Wood
2019-04-22 19:16 ` Phil Hord
2019-04-22 19:20 ` Phil Hord
2019-04-22 19:49 ` Denton Liu [this message]
2019-04-23 1:21 ` Junio C Hamano
2019-04-23 2:20 ` Phil Hord
2019-04-22 17:50 ` Phil Hord
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190422194940.GA10592@dev-l \
--to=liu.denton@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phil.hord@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).