{"thread":{"id":"12258","subject":"unexpected behavior of 'git rebase'","startedAt":"2008-02-22T15:10:47Z","lastAt":"2008-02-25T08:37:16Z","messageCount":3,"participants":["Alxneit-Kamber Ivo","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"69585","messageId":"1203693047.6429.11.camel@pc6411.psi.ch","threadId":"12258","inReplyTo":null,"subject":"unexpected behavior of 'git rebase'","fromName":"Alxneit-Kamber Ivo","fromEmail":"ivo.alxneit@psi.ch","sentAt":"2008-02-22T15:10:47Z","receivedAt":"2008-02-22T15:10:47Z","isPatch":false,"sender":{"key":"ivo.alxneit@psi.ch","avatar":null},"body":"hi,\n\ni found that 'git rebase' does not include stashed stuff. in the\nfollowing my work flow in details.\ni work on branch 'topic' and stash some things away.\n\n[alxneit@pc6411]$ git stash\n\ngitk --all shows my stashed things on 'topic'.\n\n\n                  index on topic: ...         \n                 /   \\ \n      B'---C'---D'---WIP on topic: ...    (topic with stashed thing)\n     /\nA---B---C  (master)\n\n\ni decide to rebase 'topic'.\n\n[alxneit@pc6411]$ git rebase master topic\n\ni would have expected to get\n\n\n                      index on topic: ...         \n                     /   \\\n          B'---C'---D'---WIP on topic: ...    (topic with stashed thing)\n         /\nA---B---C    (master)\n\n\ni.e. 'topic' including the stashed things are rebased. however, i the\nresult (as revealed by 'gitk --all') is\n\n\n                  index on topic: ...         \n                 /                        \\\n      B'---C'---D'---WIP on topic: ... ---stash    (gitk shows\n     /                                              no branch name\nA---B---C  (master)                                  anymore)\n         \\\n          B'---C'---D'    (topic)\n\n\n\nthe old 'topic' branch (including the stashed things) is left behind as\nan unnamed branch. only commits B', C', and D' have been rebased as\nbranch 'topic'.\n\nis this the intended behavior?\n\nthanks in advance\n\np.s. \n[alxneit@pc6411 ]$ git --version\ngit version 1.5.4.2.1.gef98\n\np.p.s:\nplease cc me. i am not subscribed to the list\n\n-- \nDr. Ivo Alxneit\nLaboratory for Solar Technology   phone: +41 56 310 4092\nPaul Scherrer Institute             fax: +41 56 310 2688\nCH-5232 Villigen                   http://solar.web.psi.ch\nSwitzerland                   gnupg key: 0x515E30C7\n"},{"id":"69674","messageId":"m3ejb3dejg.fsf@localhost.localdomain","threadId":"12258","inReplyTo":"1203693047.6429.11.camel@pc6411.psi.ch","subject":"Re: unexpected behavior of 'git rebase'","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2008-02-23T12:48:40Z","receivedAt":"2008-02-23T12:48:40Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"\"Alxneit-Kamber Ivo\" <ivo.alxneit@psi.ch> writes:\n\n> I found that 'git rebase' does not include stashed stuff.\n\nThis, I think, is caused mainly by the fact that stash is currently\nglobal per repository, and not per-branch thing.\n\nYou can always rebase stash on top of after-rebase branch.\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"69869","messageId":"1203928636.29205.2.camel@pc6411.psi.ch","threadId":"12258","inReplyTo":"m3ejb3dejg.fsf@localhost.localdomain","subject":"Re: unexpected behavior of 'git rebase'","fromName":"Alxneit-Kamber Ivo","fromEmail":"ivo.alxneit@psi.ch","sentAt":"2008-02-25T08:37:16Z","receivedAt":"2008-02-25T08:37:16Z","isPatch":false,"sender":{"key":"ivo.alxneit@psi.ch","avatar":null},"body":"On Sat, 2008-02-23 at 04:48 -0800, Jakub Narebski wrote:\n> \"Alxneit-Kamber Ivo\" <ivo.alxneit@psi.ch> writes:\n> \n> > I found that 'git rebase' does not include stashed stuff.\n> \n> This, I think, is caused mainly by the fact that stash is currently\n> global per repository, and not per-branch thing.\n> \n> You can always rebase stash on top of after-rebase branch.\n> \n\nok, thanks. so it sounds like an intended behavior (maybe the\ndocumentation should mention this explicitly).\n\nmoving the stashed stuff to the correct place and removing the\nleft-behind unnamed brach is no problem.\n\n-- \nDr. Ivo Alxneit\nLaboratory for Solar Technology   phone: +41 56 310 4092\nPaul Scherrer Institute             fax: +41 56 310 2688\nCH-5232 Villigen                   http://solar.web.psi.ch\nSwitzerland                   gnupg key: 0x515E30C7\n"}]}