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

Re: proper way to merge?

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Mar 3, 2009, 07:32 UTC
Message-ID
<49ACDD17.2060601@viscovery.net>
In-Reply-To
<450196A1AAAE4B42A00A8B27A59278E709F07452@EXCHANGE.trad.tradestation.com>
John Dlugosz schrieb:
> I did not find 'grafts' in the documentation,
> but I looked for it now that I know about it.  So you can add another
> parent to the graph just by adding a line to that file.  BTW,
> filter-branch isn't available on msysgit.
Huh? filter-branch *is* in msysgit. Why do you think it is not?
>  But leaving it in that grafts
> file should be OK -- is that pushed/pulled with everything else?
No.
You really want to use filter-branch if the new parent is to be permanent.
-- Hannes
Previous: John DlugoszNext: John Dlugosz
Message 7 of 9 in “proper way to merge?”
  1. John DlugoszFeb 27, 2009
  2. John TapsellFeb 28, 2009
  3. John DlugoszMar 2, 2009
  4. John TapsellMar 3, 2009
  5. Bryan DonlanMar 2, 2009
  6. John DlugoszMar 2, 2009
  7. Johannes SixtMar 3, 2009
  8. John DlugoszMar 3, 2009
  9. Johannes SixtMar 3, 2009

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.