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

From: Sylvain RABOT <srabot@steek•com>
To: git@vger•kernel.org
Subject: Need some help with git rebase
Date: Mon, 28 Dec 2009 14:33:27 +0100	[thread overview]
Message-ID: <4B38B3A7.6010900@steek.com> (raw)

Hello everybody,

I'm trying to backport a feature branch which is based on the master 
branch into another branch also based on master but older :

                         a--a--a--a--a--a--a--a--a feature
                        /
--x--x--x--x--x--x--x--x--x--x--x--x master
   \
    o--o--o--o--o--o--o 12.72.1
   
   
This is what I would like :
   
   
                         a--a--a--a--a--a--a--a--a feature
                        /
--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
   

And this is what I get with git rebase --onto 12.72.1 master feature
   
    o--o--o--o--o--o--o--a--a--a--a--a--a--a--a--a feature
   /
--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

Can you exlain to me what I need to do to get what I expect.

Best regards.

-- 
Sylvain

next             reply	other threads:[~2009-12-28 13:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-28 13:33 Sylvain RABOT [this message]
2009-12-30 22:24 ` Need some help with git rebase 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

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=4B38B3A7.6010900@steek.com \
    --to=srabot@steek$(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