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

Re: Need some help with git rebase

From
Sylvain Rabot <sylvain@abstraction.fr>
Date
Dec 30, 2009, 22:24 UTC
Message-ID
<1262211866.7068.1.camel@kheops>
In-Reply-To
<4B38B3A7.6010900@steek.com>
So,
I tried again "git rebase --onto 12.72.1 master feature".
Situation :
                         a--a--a--a--a--a--a--a--a feature
                        /
--x--x--x--x--x--x--x--x--x--x--x--x master
   \
    o--o--o--o--o--o--o 12.72.1
Work flow :

$ git checkout 12.72.1 $ git rebase --onto 12.72.1 master feature

a lot of conflicts, resolving and git rebase --continue

And then, at the end of the rebase, without me doing anything, feature branch is checked out and it seems that its HEAD has been reset to the new 12.72.1 HEAD.

--x--x--x--x--x--x--x--x--x--x--x--x master
   \
    o--o--o--o--o--o--o--a--a--a--a--a--a--a--a--a 12.72.1 feature

Is that normal ? If it is, how do I do to avoid my feature branch to be reset at 12.72.1's HEAD ?

Any enlightenment is very welcome.
Regards.
-- 
Sylvain Rabot <sylvain@abstraction.fr>
Previous: Sylvain RABOTNext: Wincent Colaiuta
Message 2 of 7 in “Need some help with git rebase”
  1. Sylvain RABOTDec 28, 2009
  2. Sylvain RabotDec 30, 2009
  3. Wincent ColaiutaDec 30, 2009
  4. Sylvain RabotDec 31, 2009
  5. Peter BaumannDec 31, 2009
  6. Tay Ray ChuanDec 31, 2009
  7. Wincent ColaiutaDec 31, 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.