Re: [PATCH v2] checkout: print something when checking out paths

From: Duy Nguyen <pclouds@gmail.com>
Date: Jan 29, 2019, 01:26 UTC
Message-ID: <CACsJy8B9W3XcD4ucAt7roA9grJppYK+uTH35xvafaTbkMNPAGw@mail.gmail.com>
In-Reply-To: <xmqqimy8a1gx.fsf@gitster-ct.c.googlers.com>

On Tue, Jan 29, 2019 at 4:58 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> One small bug I saw since this was merged is that the message that
> is given when unmerging, i.e.
>
>         git merge other-branch   ;# conflicts
>         git checkout --m <path>
>
> is misleading.  It gives the same "checked out ... out of the index",
> but it should be made a lot more distinct, perhaps "unmerged N paths".

Right, I missed this. How about "re-created %d merge conflicts"? It's a bit clearer, I think.

-- 
Duy

$ 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.