git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David <bouncingcats@gmail.com>
To: Howard Miller <howard@e-learndesign.co.uk>
Cc: Tim Guirgies <lt.infiltrator@gmail.com>, git@vger.kernel.org
Subject: Re: Can't get git rebase --onto to work
Date: Thu, 2 Jun 2011 21:18:06 +1000	[thread overview]
Message-ID: <BANLkTi=P_-XbmeJiUs2FaEfXLksKM6jRgw@mail.gmail.com> (raw)
In-Reply-To: <BANLkTik-o=h05=d5JH_LirYQkNzgdYaZxg@mail.gmail.com>

On 2 June 2011 20:58, Howard Miller <howard@e-learndesign.co.uk> wrote:
>
> The examples are very helpful but it could be a little more explicit
> which branches are going to get modified by the rebase. Once there are
> several branches in play it becomes quite a hard think.
>
> Mostly, I just needed a kick to say "look where the branch heads are
> pointing" (in the example diagrams) before and after the rebase. I
> don't think I would have got it without the remark in Pro Git that a
> final merge is required to get the HEADs where I wanted them. Like
> most things - it's completely obvious when you know.

If you have a graphical environment, it might help to take a look with
'gitk --all'.
Also, if you start it before the rebase, then after the rebase you
will need to use its "File>Reload" command to refresh the display.

  reply	other threads:[~2011-06-02 11:18 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-02 10:17 Can't get git rebase --onto to work Howard Miller
2011-06-02 10:32 ` Carlos Martín Nieto
2011-06-02 10:38   ` Howard Miller
2011-06-02 10:38 ` Tim Guirgies
2011-06-02 10:43   ` Howard Miller
2011-06-02 10:52     ` Tim Guirgies
2011-06-02 10:58       ` Howard Miller
2011-06-02 11:18         ` David [this message]
2011-06-02 11:18         ` Tim Guirgies
2011-06-02 11:28           ` Howard Miller

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='BANLkTi=P_-XbmeJiUs2FaEfXLksKM6jRgw@mail.gmail.com' \
    --to=bouncingcats@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=howard@e-learndesign.co.uk \
    --cc=lt.infiltrator@gmail.com \
    /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).