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

Re: What's in git.git

From
Llinux@horizon.com <linux@horizon.com>
Date
Feb 17, 2006, 14:28 UTC
Message-ID
<20060217142836.13137.qmail@science.horizon.com>
 - "Rebase to different branch" (1 commit):
   This was previously discussed on the list.  With this command
   line:
    	$ git rebase --onto master~1 master topic
    
   would rebase this ancestry graph to:
    
              A---B---C topic
             /
        D---E---F---G master
    
    
   another graph that looks like this:
    
                  A'--B'--C' topic
                 /
        D---E---F---G master
   Earlier, you couldn't rebase to anywhere other than on top of
   "the other branch".

Er... what does this do, again? I couldn't find the list discussion, and I can get this exact effect in vanilla 1.2.1 with "git rebase master~1 topic". AFAIK, $ARGV[1] of git-rebase only has to be a commit-ish, not a branch.

OTOH, I can imagine wanting
	$ git-rebase master~1 topic topic~2
to produce
              A   B---C topic
             /   /
        D---E---F---G master

H'm... I wonder if the same syntax could be used to resolve the ambiguous case where there are multiple possible common ancestors, e.g.

              A---B---C topic
             /   /
        D---E---F---G master
as discussed in the "git rebase behaviour changed?" thread...
Next: Junio C Hamano
Message 1 of 2 in “Re: What's in git.git”
  1. linux@horizon.comFeb 17, 2006
  2. Junio C HamanoFeb 18, 2006

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.