Re: [PATCH RFC 4/4] rebase -i: add --refs option to rewrite heads within branch

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Dec 23, 2009 at 3:53 AM, Michael J Gruber
<git@xxxxxxxxxxxxxxxxxxxx> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]