All of lore.kernel.org
 help / color / mirror / Atom feed
From: "John M. Dlugosz" <ngnr63q02@sneakemail.com>
To: git@vger.kernel.org
Subject: Help understanding "rebase"
Date: Tue, 10 Mar 2009 16:07:27 -0500	[thread overview]
Message-ID: <gp6kqj$tkb$1@ger.gmane.org> (raw)

Here is the situation:  An old topic branch containing 3 commits.  A dev branch that has 
recently been merged.  To catch up the topic's work before adding it to dev, I expected 
that rebase would do what I ended up doing manually, detailed below.

Instead, it crunched away for a long time and gave errors applying patches.

So I did it manually by checking out dev, then cherry-picking each of the three commits. 
Actually, this left it on top of dev, but suppose I had created a new branch at dev, 
cherry-picked the stuff from the old topic branch, and then deleted the old topic branch. 
  Now I have a new topic branch with the rebased changes, albeit with a different branch 
name.  Point is, there were no conflicts and the changes were simple, so cherry-picking 
each node was clean.

So, what did the rebase command try to do?  I think it may have something to do with 
finding a common root between the topic and dev, which, due to the merge, was a long way 
back.  Something like this:

	  o--o--   ...  --o
	 /                 \
	A--...--B--   ... --C--D <== dev
	         \
                   q--r--s  <== topic


I was able to cherry-pick q,r,s on top of D without any issues.  So why did rebase get in 
such a tizzy?

--John

             reply	other threads:[~2009-03-10 21:21 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-10 21:07 John M. Dlugosz [this message]
2009-03-10 21:30 ` Help understanding "rebase" Brandon Casey
2009-03-11  9:24   ` Michael J Gruber
  -- strict thread matches above, loose matches on Subject: below --
2009-03-11 20:04 John Dlugosz

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='gp6kqj$tkb$1@ger.gmane.org' \
    --to=ngnr63q02@sneakemail.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.