public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: bill lam <cbill.lam@gmail•com>
To: git <git@vger•kernel.org>
Subject: how to rebase backwards
Date: Tue, 3 Nov 2009 13:45:10 +0800	[thread overview]
Message-ID: <20091103054510.GB7117@debian.b2j> (raw)

I want to rebase a new branch onto an earlier commit 

original:  
E is a newly created branch from D and not yet modified
                    E
                   /
-- A -- B -- C -- D

new: what I wanted
     B'-- C' -- E     for deployment
    /          
-- A -- B -- C -- D    trunk

so that I can continue to change all commits from B to C without
affecting E

I try (not sure if correct) doing it by
  git rebase --onto A B E

but then there is a lot of conflict/both modified files. What will be
the correct way to do it?

-- 
regards,
====================================================
GPG key 1024D/4434BAB3 2008-08-24
gpg --keyserver subkeys.pgp.net --recv-keys 4434BAB3

next             reply	other threads:[~2009-11-03  5:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-11-03  5:45 bill lam [this message]
2009-11-03  7:43 ` how to rebase backwards Junio C Hamano
2009-11-03  9:37   ` bill lam
2009-11-05 19:12     ` David Kågedal
2009-11-06  1:43       ` bill lam

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=20091103054510.GB7117@debian.b2j \
    --to=cbill.lam@gmail$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox