From: Christian Couder <chriscool@tuxfamily.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Paolo Bonzini <bonzini@gnu.org>,
Stephen Boyd <bebarino@gmail.com>
Subject: [PATCH v3 7/9] Documentation: describe new cherry-pick --ff option
Date: Wed, 03 Mar 2010 21:11:42 +0100 [thread overview]
Message-ID: <20100303201146.23506.32147.chriscool@tuxfamily.org> (raw)
In-Reply-To: <20100303201046.23506.32653.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.315.gbc198
next prev parent reply other threads:[~2010-03-04 2:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-03 20:11 [PATCH v3 0/9] add --ff option to cherry-pick Christian Couder
2010-03-03 20:11 ` [PATCH v3 1/9] reset: refactor updating heads into a static function Christian Couder
2010-03-03 20:11 ` [PATCH v3 2/9] reset: refactor reseting in its own function Christian Couder
2010-03-03 20:11 ` [PATCH v3 3/9] reset: make reset function non static and declare it in "reset.h" Christian Couder
2010-03-03 20:11 ` [PATCH v3 4/9] revert: refactor checking parent in a check_parent() function Christian Couder
2010-03-03 20:11 ` [PATCH v3 5/9] revert: add --ff option to allow fast forward when cherry-picking Christian Couder
2010-03-03 20:11 ` [PATCH v3 6/9] cherry-pick: add tests for new --ff option Christian Couder
2010-03-03 20:11 ` Christian Couder [this message]
2010-03-03 20:11 ` [PATCH v3 8/9] cherry-pick: add a no-op --no-ff option to future proof scripts Christian Couder
2010-03-03 20:11 ` [PATCH v3 9/9] rebase -i: use new --ff cherry-pick option Christian Couder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100303201146.23506.32147.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=bonzini@gnu.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).