Re: [PATCH] pull: don't say that merge is "the default strategy"

From: Junio C Hamano <gitster@pobox.com>
Date: Nov 18, 2021, 21:30 UTC
Message-ID: <xmqqk0h5w3qy.fsf@gitster.g>
In-Reply-To: <20211118154317.639118-1-alexhenrie24@gmail.com>

Alex Henrie <alexhenrie24@gmail.com> writes:

> Git no longer has a default strategy for reconciling divergent branches,
> because there's no way for Git to know which strategy is appropriate in
> any particular situation.

A very good observation, and the patch makes sense.

Show 5 quoted lines

> The initially proposed version of commit
> 031e2f7ae195069d00d21cde906fce5b0318dbdd, "pull: abort by default when
> fast-forwarding is not possible", dropped this phrase from the message.
> It appears that leaving it in the message in the final version of the
> patch was accidental.

Hmph, the one before later iterations v$N, i.e.
 
https://lore.kernel.org/git/dca0455898a838b46546a29ee79f0a8b112fbff5.1626536508.git.gitgitgadget@gmail.com/

seems to keep "the default" label from the beginning.

I am tempted to drop this latter last paragraph, which looks more like a guess than anything else, and does not add much value to future readers of the "git log".

Show 19 quoted lines

>
> Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
> ---
>  builtin/pull.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/pull.c b/builtin/pull.c
> index 127798ba84..590f15bf9b 100644
> --- a/builtin/pull.c
> +++ b/builtin/pull.c
> @@ -970,7 +970,7 @@ static void show_advice_pull_non_ff(void)
>  		 "You can do so by running one of the following commands sometime before\n"
>  		 "your next pull:\n"
>  		 "\n"
> -		 "  git config pull.rebase false  # merge (the default strategy)\n"
> +		 "  git config pull.rebase false  # merge\n"
>  		 "  git config pull.rebase true   # rebase\n"
>  		 "  git config pull.ff only       # fast-forward only\n"
>  		 "\n"