unexpected behavior of 'git rebase'

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

"Alxneit-Kamber Ivo" <ivo.alxneit@psi.ch> writes:

This, I think, is caused mainly by the fact that stash is currently global per repository, and not per-branch thing.

You can always rebase stash on top of after-rebase branch.

On Sat, 2008-02-23 at 04:48 -0800, Jakub Narebski wrote:

ok, thanks. so it sounds like an intended behavior (maybe the documentation should mention this explicitly).

moving the stashed stuff to the correct place and removing the left-behind unnamed brach is no problem.