git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Greg Price <price@ksplice.com>
Date
Dec 23, 2009, 17:34 UTC
Message-ID
<1ac2d430912230934h600575e4h17e2ee84f53de1a0@mail.gmail.com>
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:

Show 7 quoted lines
> 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
Previous: Michael J GruberNext: Junio C Hamano
Message 9 of 11 in “rebase -i: Add --refs option to rewrite heads within branch”
  1. 0/4 rebase -i: Add --refs option to rewrite heads within branchGreg Price, Dec 22, 2009
  2. 1/4 pretty: Add %D for script-friendly decorationGreg Price, Dec 22, 2009
  3. 2/4 log --decorate=full: drop the "tag: " prefixGreg Price, Dec 22, 2009
  4. 3/4 rebase -i: Add the "ref" commandGreg Price, Dec 22, 2009
  5. 4/4 rebase -i: add --refs option to rewrite heads within branchGreg Price, Dec 22, 2009
  6. Junio C HamanoDec 22, 2009
  7. Greg PriceDec 23, 2009
  8. Michael J GruberDec 23, 2009
  9. Greg PriceDec 23, 2009
  10. Junio C HamanoDec 23, 2009
  11. Johannes SchindelinDec 23, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.