From: Christian MICHON <christian.michon@gmail.com>
To: David Reitter <david.reitter@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: merging two equivalent branches
Date: Thu, 7 Jan 2010 19:22:00 +0100 [thread overview]
Message-ID: <46d6db661001071022t79ca65foac249d948a20c328@mail.gmail.com> (raw)
In-Reply-To: <B0543B3C-C139-4BD3-B028-58B4DA132422@gmail.com>
On Thu, Jan 7, 2010 at 7:17 PM, David Reitter <david.reitter@gmail.com> wrote:
> Hello,
>
> I have a problem with my git project, resulting from an upstream branch beyond my control being rewritten.
>
> Can I specify parents for a revision whose history is hidden from git-log?
>
I recall asking a similar question in 2008, and the answer was to look
at "git graft" and use "git filter-branch" to recreate history.
My 2 cents
--
Christian
--
http://detaolb.sourceforge.net/, a linux distribution for Qemu with Git inside !
next prev parent reply other threads:[~2010-01-07 18:22 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 18:17 merging two equivalent branches David Reitter
2010-01-07 18:22 ` Christian MICHON [this message]
2010-01-07 21:16 ` git-log - hide parent (was: merging two equivalent branches) David Reitter
2010-01-08 5:00 ` Christian Couder
2010-01-12 16:59 ` David Reitter
2010-01-08 19:50 ` Avery Pennarun
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=46d6db661001071022t79ca65foac249d948a20c328@mail.gmail.com \
--to=christian.michon@gmail.com \
--cc=david.reitter@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).