threads / discuss / 3372

Re: What's in git.git

Subject: Re: What's in git.git

## tl;dr

2 messages between Feb 17, 2006 and Feb 18, 2006.

replies: 1people: 2as markdown or json

linux@horizon.com· Feb 17, 2006, 14:28 UTC · lore
 - "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...
Junio C Hamano· Feb 18, 2006, 06:49 UTC · re: linux@horizon.com · lore
linux@horizon.com writes:
Show 9 quoted lines
> 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".
>...
> OTOH, I can imagine wanting
>...
>               A   B---C topic
>              /   /
>         D---E---F---G master
Yup.  The example was a bad one, but the above, and in general
         X---A'--B'--C' topic
         D---E---F---G master
on an arbitrary X was what I wanted to do.

← back to recent threads