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

[RFC/PATCH 0/6] add --ff option to cherry-pick

From
Christian Couder <chriscool@tuxfamily.org>
Date
Feb 1, 2010, 07:55 UTC
Message-ID
<20100201074835.3929.11509.chriscool@tuxfamily.org>

The goal of this series is to add a --ff fast forward otion to cherry-pick and use it in "rebase -i".

There is no documentation yet and the commit messages are too short but this will be improved if the series looks worthwhile.

The first patch in this series is a refactoring patch that is not really needed, but as it looks like a good refactoring/cleanup anyway I left it in.

Christian Couder (5):
  reset: refactor updating heads into a static function
  reset: refactor reseting in its own function
  reset: make reset function non static and declare it in "reset.h"
  revert: add --ff option to allow fast forward when cherry-picking
  rebase -i: use new --ff cherry-pick option
Stephan Beyer (1):
  revert: libify cherry-pick and revert functionnality
 Makefile                   |    2 +
 builtin-reset.c            |  175 +++++++++++++++------------
 builtin-revert.c           |  293 ++++++++++----------------------------------
 git-rebase--interactive.sh |   15 +--
 pick.c                     |  218 ++++++++++++++++++++++++++++++++
 pick.h                     |   13 ++
 reset.h                    |   10 ++
 7 files changed, 407 insertions(+), 319 deletions(-)
 create mode 100644 pick.c
 create mode 100644 pick.h
 create mode 100644 reset.h
Next: Christian Couder
Message 1 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.