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

Re: [RFC/PATCH 1/6] revert: libify cherry-pick and revert functionnality

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Feb 1, 2010, 10:26 UTC
Message-ID
<alpine.DEB.1.00.1002011124440.4985@pacific.mpi-cbg.de>
In-Reply-To
<20100201075542.3929.38404.chriscool@tuxfamily.org>
Hi,
On Mon, 1 Feb 2010, Christian Couder wrote:
Show 31 quoted lines
> From: Stephan Beyer <s-beyer@gmx.net>
> 
> The goal of this commit is to abstract out "git cherry-pick" and
> "git revert" functionnality into a new pick_commit() function made
> of code from "builtin-revert.c".
> 
> The new pick_commit() function is in a new "pick.c" file with an
> associated "pick.h".
> 
> This function starts from the current index (not HEAD), and allow
> the effect of one commit replayed (either forward or backward) to
> that state, leaving the result in the index. So it makes it
> possible to replay many commits to the index in sequence without
> commiting in between.
> 
> This commit is made of code from the sequencer GSoC project:
> 
> git://repo.or.cz/git/sbeyer.git
> 
> (at commit 5a78908b70ceb5a4ea9fd4b82f07ceba1f019079)
> 
> And it contains some changes and comments suggested by Junio.
> 
> The original commit in the sequencer project that introduced
> this change is: 94a568a78d243d7a6c13778bc6b7ac1eb46e48cc
> 
> Mentored-by: Daniel Barkalow <barkalow@iabervon.org>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Signed-off-by: Stephan Beyer <s-beyer@gmx.net>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---

I guess that this patch would look nicer using --patience. In its current form, it would put too big a dent in my Git time budget, sorry, I will not review it.

Ciao, Dscho

Previous: Christian CouderNext: Stephen Boyd
Message 3 of 14 in “add --ff option to cherry-pick”
  1. 0/6 add --ff option to cherry-pickChristian Couder, Feb 1, 2010
  2. 1/6 revert: libify cherry-pick and revert functionnalityChristian Couder, Feb 1, 2010
  3. Johannes SchindelinFeb 1, 2010
  4. Stephen BoydFeb 3, 2010
  5. 2/6 reset: refactor updating heads into a static functionChristian Couder, Feb 1, 2010
  6. 3/6 reset: refactor reseting in its own functionChristian Couder, Feb 1, 2010
  7. 4/6 reset: make reset function non static and declare it in "reset.h"Christian Couder, Feb 1, 2010
  8. 5/6 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Feb 1, 2010
  9. Paolo BonziniFeb 1, 2010
  10. Christian CouderFeb 1, 2010
  11. Paolo BonziniFeb 1, 2010
  12. Christian CouderFeb 2, 2010
  13. Paolo BonziniFeb 2, 2010
  14. 6/6 rebase -i: use new --ff cherry-pick optionChristian Couder, Feb 1, 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.