git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: merging two equivalent branches

From
Christian MICHON <christian.michon@gmail.com>
Date
Jan 7, 2010, 18:22 UTC
Message-ID
<46d6db661001071022t79ca65foac249d948a20c328@mail.gmail.com>
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:
Show 6 quoted lines
> 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 !
Previous: David ReitterNext: David Reitter
Message 2 of 6 in “merging two equivalent branches”
  1. David ReitterJan 7, 2010
  2. Christian MICHONJan 7, 2010
  3. git-log - hide parent (was: merging two equivalent branches)David Reitter, Jan 7, 2010
  4. Christian CouderJan 8, 2010
  5. David ReitterJan 12, 2010
  6. Avery PennarunJan 8, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.