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

unexpected behavior of 'git rebase'

From
AIAlxneit-Kamber Ivo <ivo.alxneit@psi.ch>
Date
Feb 22, 2008, 15:10 UTC
Message-ID
<1203693047.6429.11.camel@pc6411.psi.ch>
hi,

i found that 'git rebase' does not include stashed stuff. in the following my work flow in details. i work on branch 'topic' and stash some things away.

[alxneit@pc6411]$ git stash
gitk --all shows my stashed things on 'topic'.
                  index on topic: ...         
                 /   \ 
      B'---C'---D'---WIP on topic: ...    (topic with stashed thing)
     /
A---B---C  (master)
i decide to rebase 'topic'.
[alxneit@pc6411]$ git rebase master topic
i would have expected to get
                      index on topic: ...         
                     /   \
          B'---C'---D'---WIP on topic: ...    (topic with stashed thing)
         /
A---B---C    (master)

i.e. 'topic' including the stashed things are rebased. however, i the result (as revealed by 'gitk --all') is

                  index on topic: ...         
                 /                        \
      B'---C'---D'---WIP on topic: ... ---stash    (gitk shows
     /                                              no branch name
A---B---C  (master)                                  anymore)
         \
          B'---C'---D'    (topic)

the old 'topic' branch (including the stashed things) is left behind as an unnamed branch. only commits B', C', and D' have been rebased as branch 'topic'.

is this the intended behavior?
thanks in advance

p.s. [alxneit@pc6411 ]$ git --version git version 1.5.4.2.1.gef98

p.p.s: please cc me. i am not subscribed to the list

-- 
Dr. Ivo Alxneit
Laboratory for Solar Technology   phone: +41 56 310 4092
Paul Scherrer Institute             fax: +41 56 310 2688
CH-5232 Villigen                   http://solar.web.psi.ch
Switzerland                   gnupg key: 0x515E30C7
Next: Jakub Narebski
Message 1 of 3 in “unexpected behavior of 'git rebase'”
  1. Alxneit-Kamber IvoFeb 22, 2008
  2. Jakub NarebskiFeb 23, 2008
  3. Alxneit-Kamber IvoFeb 25, 2008

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.