On Fri, Aug 30, 2019 at 3:57 PM Junio C Hamano wrote:
> If we want to dedicate one paragraph for each of these options, we
> can and should make the introductory paragraph lighter by saying
> something like
>
> Specifies how a merge is handled when the merged-in history
> is alread
Elijah Newren writes:
> diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
> index 79a00d2a4a..ed3804650b 100644
> --- a/Documentation/merge-options.txt
> +++ b/Documentation/merge-options.txt
> @@ -40,20 +40,26 @@ set to `no` at the beginning of them.
> case of
As discovered on the mailing list, some of the descriptions of the
ff-related options were unclear. Try to be more precise with what these
options do.
Signed-off-by: Elijah Newren
---
Changes since v2:
* reordered the options
* typeset the option flags differently to ensure they are monospac
3 matches
Mail list logo
