Re: [PATCH 6/6] Documentation/git-merge.txt: get rid of irrelevant references to git-pull

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 5, 2016, 21:43 UTC
Message-ID: <xmqq60p6o4js.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <87shsapjiz.fsf@javad.com>

Sergey Organov <sorganov@gmail.com> writes:

> So I believe this change is inline with the rest of the patch. The
> reference to git-pull (if it remains) should be a side-note, not part of
> explanation of operation.

Not really. The thing is, "This is the most common" needs to be close to "Often...". "git merge" directly invoked by the end user is much less likely to encounter a fast forward situation; getting invoked indirectly by "git pull" makes it common.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.