From: Samuel Bronson Date: Thu, 01 Dec 2011 01:38:57 GMT Subject: [PATCH/RFC 2/2] merge, pull: Document the --no-ff-only merge option Message-ID: <1322703537-3914-2-git-send-email-naesten@gmail.com> 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 --- 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=:: -- 1.7.7.3