git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tay Ray Chuan <rctay89@gmail.com>
To: sylvain@abstraction.fr
Cc: git@vger.kernel.org
Subject: Re: Need some help with git rebase
Date: Thu, 31 Dec 2009 13:01:00 +0800	[thread overview]
Message-ID: <be6fef0d0912302101ta010dfamab05b751a0ceee76@mail.gmail.com> (raw)
In-Reply-To: <1262211866.7068.1.camel@kheops>

Hi,

On Thu, Dec 31, 2009 at 6:24 AM, Sylvain Rabot <sylvain@abstraction.fr> wrote:
> 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 ?

reading the manual, I think this is normal.

According to the third paragraph of the description of git-rebase, the
branch feature will be reset to 12.72.1.

You can just rename the branch back to 12.72.1, and retrieve the old
tip of feature by examining the reflog.

-- 
Cheers,
Ray Chuan

      parent reply	other threads:[~2009-12-31  5:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-28 13:33 Need some help with git rebase Sylvain RABOT
2009-12-30 22:24 ` Sylvain Rabot
2009-12-30 22:46   ` Wincent Colaiuta
2009-12-31  9:02     ` Sylvain Rabot
2009-12-31  9:32       ` Peter Baumann
     [not found]     ` <7fce93be0912301502r77152c52sbccf762fb6c44610@mail.gmail.com>
2009-12-31 11:06       ` Wincent Colaiuta
2009-12-31  5:01   ` Tay Ray Chuan [this message]

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=be6fef0d0912302101ta010dfamab05b751a0ceee76@mail.gmail.com \
    --to=rctay89@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sylvain@abstraction.fr \
    /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).