git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Samuel Bronson <naesten@gmail.com>
To: git@vger.kernel.org
Cc: Samuel Bronson <naesten@gmail.com>
Subject: [PATCH/RFC 2/2] merge, pull: Document the --no-ff-only merge option
Date: Wed, 30 Nov 2011 20:38:57 -0500	[thread overview]
Message-ID: <1322703537-3914-2-git-send-email-naesten@gmail.com> (raw)
In-Reply-To: <1322703537-3914-1-git-send-email-naesten@gmail.com>

Now that --no-ff-only will work with pull and not just with merge, we
should probably tell the users about it.

Signed-off-by: Samuel Bronson <naesten@gmail.com>
---
 Documentation/merge-options.txt |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 6bd0b04..2adc4f5 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -56,9 +56,13 @@ With --no-squash perform the merge and commit the result. This
 option can be used to override --squash.
 
 --ff-only::
+--no-ff-only::
 	Refuse to merge and exit with a non-zero status unless the
 	current `HEAD` is already up-to-date or the merge can be
 	resolved as a fast-forward.
++
+With --no-ff-only, don't refuse. This is can be used to override
+--ff-only, or the "`only`" value for the `merge.ff` configuration option.
 
 -s <strategy>::
 --strategy=<strategy>::
-- 
1.7.7.3

  reply	other threads:[~2011-12-01  1:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-01  1:38 [PATCH/RFC 1/2] pull: pass the --no-ff-only flag through to merge, not fetch Samuel Bronson
2011-12-01  1:38 ` Samuel Bronson [this message]
2011-12-01  4:58 ` Junio C Hamano
2011-12-01 17:18   ` Samuel Bronson
2011-12-01 18:06     ` Junio C Hamano
2011-12-01 18:59       ` Samuel Bronson

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=1322703537-3914-2-git-send-email-naesten@gmail.com \
    --to=naesten@gmail.com \
    --cc=git@vger.kernel.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).