From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: Very complex rebasing - Need help
Date: Fri, 08 Sep 2006 15:43:09 +0200 [thread overview]
Message-ID: <edrs0d$42k$1@sea.gmane.org> (raw)
In-Reply-To: 6208897.post@talk.nabble.com
Jehreg wrote:
> In the Buildroot repo:
> initial--o--o--ID3--o--o--ID4--o--master
> \
> --o--o--o--o--o--o--o--o--myproject
>
> My problem is that I need to kinda-rebase the ID4 into the myproject
branch
> to make it finally look like this:
>
> initial--o--o--ID3--o--o--ID4--o--master
> \ \
> --o--o--o--o--o--x--o--o--myproject
>
>
> Any ideas ?
Grafts? Grafting additional parent to commit x.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
prev parent reply other threads:[~2006-09-08 13:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-08 13:27 Very complex rebasing - Need help Jehreg
2006-09-08 13:43 ` Jakub Narebski [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='edrs0d$42k$1@sea.gmane.org' \
--to=jnareb@gmail.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 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).