From: Jay Soffian <jaysoffian@gmail.com>
To: Peter Krefting <peter@softwolves.pp.se>
Cc: git <git@vger.kernel.org>
Subject: Re: rebasing a merge
Date: Thu, 24 Jun 2010 10:22:38 -0400 [thread overview]
Message-ID: <AANLkTik5PteeUzGvElMTiTiFf64s4KFEyoTAq_f8wLAf@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1006241012400.28950@ds9.cixit.se>
On Thu, Jun 24, 2010 at 5:16 AM, Peter Krefting <peter@softwolves.pp.se> wrote:
> You could probably get off by "git cat-file" the commit object, changing the
> parent reference to point to the newly introduced commit while leaving the
> rest intact, and then "git hash-object" the new commit object, and then
> forward the branch head to that one.
Did you miss my followup message?
http://article.gmane.org/gmane.comp.version-control.git/149335
j.
prev parent reply other threads:[~2010-06-24 14:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-17 15:51 rebasing a merge Jay Soffian
2010-06-18 4:38 ` Jay Soffian
2010-06-18 9:10 ` Peter Krefting
2010-06-18 15:19 ` Jay Soffian
2010-06-24 9:16 ` Peter Krefting
2010-06-24 14:22 ` Jay Soffian [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=AANLkTik5PteeUzGvElMTiTiFf64s4KFEyoTAq_f8wLAf@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=peter@softwolves.pp.se \
/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).