From: Christian Couder Date: Sun, 28 Feb 2010 22:22:05 GMT Subject: [PATCH v2 10/12] Documentation: describe new cherry-pick --ff option Message-ID: <20100228222208.2260.59369.chriscool@tuxfamily.org> In-Reply-To: <20100228222038.2260.25016.chriscool@tuxfamily.org> Signed-off-by: Christian Couder --- 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] +'git cherry-pick' [--edit] [-n] [-m parent-number] [-s] [-x] [--ff] 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