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

Re: [PATCH v1 0/3] Add --graft option to git replace

From
Christian Couder <chriscool@tuxfamily.org>
Date
May 27, 2014, 19:05 UTC
Message-ID
<20140527.210520.2165451218485597326.chriscool@tuxfamily.org>
In-Reply-To
<xmqq7g5cl9d2.fsf@gitster.dls.corp.google.com>
From: Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v1 0/3] Add --graft option to git replace
Date: Fri, 23 May 2014 09:59:05 -0700
Show 21 quoted lines
> Christian Couder <chriscool@tuxfamily.org> writes:
> 
>> Here is a small patch series to implement:
>>
>> 	git replace [-f] --graft <commit> [<parent>...]
>>
>> The changes since the RFC/PATCH are the following:
>>
>> - in patch 1/3, parse_commit_buffer() is now used to
>>   make sure <commit> is not corrupt
>> - patch 2/3 add some tests
>> - patch 3/3 add some documentation
>>
>> About the documentation, maybe we should add that --graft
>> can now be used instead of grafts in .git/info/grafts,
>> and maybe we could add an example that shows how it can
>> be done.
> 
> Or a procedure that reads .git/info/grafts, converts it to a set of
> replacements and drops .git/info/grafts.  A sample script could be
> thrown in to contrib/ somewhere as "convert-graft-to-replace.sh".
Ok, I just sent a patch that adds such a sample script.

Thanks, Christian.

Previous: Junio C Hamano
Message 15 of 15 in “Add --graft option to git replace”
  1. 0/3 Add --graft option to git replaceChristian Couder, May 22, 2014
  2. 1/3 replace: add --graft optionChristian Couder, May 22, 2014
  3. Junio C HamanoMay 23, 2014
  4. Jeff KingMay 23, 2014
  5. Junio C HamanoMay 23, 2014
  6. Jeff KingMay 23, 2014
  7. Junio C HamanoMay 23, 2014
  8. Eric SunshineMay 23, 2014
  9. Christian CouderJun 1, 2014
  10. 2/3 replace: add test for --graftChristian Couder, May 22, 2014
  11. 3/3 Documentation: replace: add --graft optionChristian Couder, May 22, 2014
  12. Jakub NarębskiMay 23, 2014
  13. Junio C HamanoMay 23, 2014
  14. Junio C HamanoMay 23, 2014
  15. Christian CouderMay 27, 2014

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.