git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Alxneit-Kamber Ivo" <ivo.alxneit@psi.ch>
To: <git@vger.kernel.org>
Subject: unexpected behavior of 'git rebase'
Date: Fri, 22 Feb 2008 16:10:47 +0100	[thread overview]
Message-ID: <1203693047.6429.11.camel@pc6411.psi.ch> (raw)

[-- Attachment #1: Type: text/plain, Size: 1780 bytes --]

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

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

             reply	other threads:[~2008-02-22 15:27 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-22 15:10 Alxneit-Kamber Ivo [this message]
2008-02-23 12:48 ` unexpected behavior of 'git rebase' Jakub Narebski
2008-02-25  8:37   ` Alxneit-Kamber Ivo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1203693047.6429.11.camel@pc6411.psi.ch \
    --to=ivo.alxneit@psi.ch \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).