From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Nov 2009 20:32:59 +0000 (-0800)
Subject: Merge branch 'bg/merge-ff-only'
X-Git-Tag: v1.6.6-rc0~62
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1;p=git.git

Merge branch 'bg/merge-ff-only'

* bg/merge-ff-only:
  Teach 'git merge' and 'git pull' the option --ff-only
---

3cc335181fdeba6cb25e9a6e55217b2e8d18e6b1
diff --cc Documentation/merge-options.txt
index 48d04a5d8,27a9a8489..fec339430
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -45,10 -46,25 +45,15 @@@ merge
  	commit.  This allows you to create a single commit on
  	top of the current branch whose effect is the same as
  	merging another branch (or more in case of an octopus).
 -
 ---no-squash::
 -	Perform the merge and commit the result. This option can
 -	be used to override --squash.
 -
 ---no-ff::
 -	Generate a merge commit even if the merge resolved as a
 -	fast-forward.
 -
 ---ff::
 -	Do not generate a merge commit if the merge resolved as
 -	a fast-forward, only update the branch pointer. This is
 -	the default behavior of git-merge.
 ++
 +With --no-squash perform the merge and commit the result. This
 +option can be used to override --squash.
  
+ --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.
+ 
  -s <strategy>::
  --strategy=<strategy>::
  	Use the given merge strategy; can be supplied more than