Yann Droneaud <ydroneaud@xxxxxxxxxx> writes:
> Thanks. I wasn't aware of the --no-ff-only option and
> thought --no-ff would be the opposite of --ff-only,
> or at least disable it given the order of the options.
>
> Please find a patch to document option --no-ff-only
>
> Documentation/merge-options.txt | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/Documentation/merge-options.txt
> b/Documentation/merge-options.txt
> index 0bcbe0a..20a31cf 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -37,6 +37,10 @@ set to `no` at the beginning of them.
> current `HEAD` is already up-to-date or the merge can be
> resolved as a fast-forward.
>
> +--no-ff-only::
> + Disable `--ff-only` behavior, eg. allows creation of merge commit.
> + This is the default behavior.
> +
We should follow the usual
--option::
--no-option::
description for both
convention for this one, before or after fixing the existing --ff/--no-ff
description.
> --log[=<n>]::
> --no-log::
> In addition to branch names, populate the log message with
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html