From: Junio C Hamano <gitster@pobox.com>
To: Alex Henrie <alexhenrie24@gmail.com>
Cc: git@vger.kernel.org, newren@gmail.com, sluongng@gmail.com,
matthias.baumgarten@aixigo.com, sunshine@sunshineco.com,
avarab@gmail.com, johannes.schindelin@gmx.de
Subject: Re: [PATCH] pull: don't say that merge is "the default strategy"
Date: Thu, 18 Nov 2021 13:30:45 -0800 [thread overview]
Message-ID: <xmqqk0h5w3qy.fsf@gitster.g> (raw)
In-Reply-To: <20211118154317.639118-1-alexhenrie24@gmail.com> (Alex Henrie's message of "Thu, 18 Nov 2021 08:43:17 -0700")
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.
> 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".
>
> 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"
next prev parent reply other threads:[~2021-11-18 21:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 15:43 [PATCH] pull: don't say that merge is "the default strategy" Alex Henrie
2021-11-18 21:30 ` Junio C Hamano [this message]
2021-11-18 21:40 ` Alex Henrie
2021-11-19 5:41 ` Elijah Newren
2021-11-19 17:16 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk0h5w3qy.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=alexhenrie24@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=matthias.baumgarten@aixigo.com \
--cc=newren@gmail.com \
--cc=sluongng@gmail.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).