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

[PATCH v2 10/12] Documentation: describe new cherry-pick --ff option

From
Christian Couder <chriscool@tuxfamily.org>
Date
Feb 28, 2010, 22:22 UTC
Message-ID
<20100228222208.2260.59369.chriscool@tuxfamily.org>
In-Reply-To
<20100228222038.2260.25016.chriscool@tuxfamily.org>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 Documentation/git-cherry-pick.txt |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 78f4714..d71607a 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit
 
 SYNOPSIS
 --------
-'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] <commit>
+'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] <commit>
 
 DESCRIPTION
 -----------
@@ -70,6 +70,10 @@ effect to your index in a row.
 --signoff::
 	Add Signed-off-by line at the end of the commit message.
 
+--ff::
+	If the current HEAD is the same as the parent of the
+	cherry-pick'ed commit, then a fast forward to this commit will
+	be performed.
 
 Author
 ------

-- 
1.7.0.321.g2d270
Previous: Christian CouderNext: Christian Couder
Message 11 of 24 in “add --ff option to cherry-pick”
  1. 00/12 add --ff option to cherry-pickChristian Couder, Feb 28, 2010
  2. 01/12 revert: libify cherry-pick and revert functionnalityChristian Couder, Feb 28, 2010
  3. 02/12 pick: refactor checking parent in a check_parent functionChristian Couder, Feb 28, 2010
  4. 03/12 pick: make check_parent function externChristian Couder, Feb 28, 2010
  5. 04/12 pick: move calling check_parent() ouside pick_commit()Christian Couder, Feb 28, 2010
  6. 05/12 reset: refactor updating heads into a static functionChristian Couder, Feb 28, 2010
  7. 06/12 reset: refactor reseting in its own functionChristian Couder, Feb 28, 2010
  8. 07/12 reset: make reset function non static and declare it in "reset.h"Christian Couder, Feb 28, 2010
  9. 08/12 revert: add --ff option to allow fast forward when cherry-pickingChristian Couder, Feb 28, 2010
  10. 09/12 cherry-pick: add tests for new --ff optionChristian Couder, Feb 28, 2010
  11. 10/12 Documentation: describe new cherry-pick --ff optionChristian Couder, Feb 28, 2010
  12. 11/12 cherry-pick: add a no-op --no-ff option to future proof scriptsChristian Couder, Feb 28, 2010
  13. 12/12 rebase -i: use new --ff cherry-pick optionChristian Couder, Feb 28, 2010
  14. Junio C HamanoMar 1, 2010
  15. Daniel BarkalowMar 1, 2010
  16. Christian CouderMar 1, 2010
  17. Junio C HamanoMar 1, 2010
  18. Christian CouderMar 4, 2010
  19. Junio C HamanoMar 4, 2010
  20. Christian CouderMar 4, 2010
  21. Junio C HamanoMar 4, 2010
  22. Jonathan NiederMar 21, 2010
  23. Johannes SixtMar 1, 2010
  24. Paolo BonziniMar 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.