From: Christian MICHON Date: Thu, 07 Jan 2010 18:22:00 GMT Subject: Re: merging two equivalent branches Message-ID: <46d6db661001071022t79ca65foac249d948a20c328@mail.gmail.com> In-Reply-To: On Thu, Jan 7, 2010 at 7:17 PM, David Reitter 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 !