git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Greg Price <price@ksplice.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH RFC 4/4] rebase -i: add --refs option to rewrite heads  within branch
Date: Wed, 23 Dec 2009 12:34:29 -0500	[thread overview]
Message-ID: <1ac2d430912230934h600575e4h17e2ee84f53de1a0@mail.gmail.com> (raw)
In-Reply-To: <4B31DA96.1050608@drmicha.warpmail.net>

On Wed, Dec 23, 2009 at 3:53 AM, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> If I may jump in: I imagine this to be the more common use case, i.e.:
> You have a part of the DAG which you want to rebase, with all kinds of
> refs (branches, tags) pointing to commits in that part of the DAG. If
> you rebase that part of the DAG you typically want some refs rewritten
> (such as the head of the branch you're rebasing) but maybe not others
> (say a release tag or branch). remote refs should never be rebased. So,
> one would need an easy way to specify one ref, all or anything in between...

I see the interactive aspect as the backstop that gives the user total
flexibility, whatever command-line interface we choose.  So, for
example, a user might find it easiest to pass --rewrite-heads so that
all heads on the given part of the DAG are inserted as "ref" commands
in the appropriate places, and then go through and remove from the
TODO file any exceptions.

But I agree it is worth making convenient shortcuts by which the user
can specify their intention precisely on the command line itself.  And
in any case, if we are to satisfy this latter use case we need a way
of specifying a part of the DAG to rebase that is not only ancestors
of a single commit.  What do you think of the
"--rewrite-refs=refs/heads/,refs/tags/" and "git rebase -i master
topic side" proposals in my reply to Junio?

Greg

  reply	other threads:[~2009-12-23 17:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-22 22:20 [PATCH RFC 0/4] rebase -i: Add --refs option to rewrite heads within branch Greg Price
2009-12-22 22:22 ` [PATCH 1/4] pretty: Add %D for script-friendly decoration Greg Price
2009-12-22 22:22 ` [PATCH 2/4] log --decorate=full: drop the "tag: " prefix Greg Price
2009-12-22 22:22 ` [PATCH RFC 3/4] rebase -i: Add the "ref" command Greg Price
2009-12-22 22:23 ` [PATCH RFC 4/4] rebase -i: add --refs option to rewrite heads within branch Greg Price
2009-12-22 23:37   ` Junio C Hamano
2009-12-23  7:03     ` Greg Price
2009-12-23  8:53       ` Michael J Gruber
2009-12-23 17:34         ` Greg Price [this message]
2009-12-23 18:11         ` Junio C Hamano
2009-12-23 13:28       ` Johannes Schindelin

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1ac2d430912230934h600575e4h17e2ee84f53de1a0@mail.gmail.com \
    --to=price@ksplice.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /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.
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 NNTP newsgroup(s).