Re: [PATCH] checkout.txt: note about losing staged changes with --merge

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 20, 2019, 01:50 UTC
Message-ID: <xmqqftriwbz6.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CACsJy8AUH4nOkt6H=yu=eRktK4me9kEkjqsC3zyNZDwUKXqCPg@mail.gmail.com>

Duy Nguyen <pclouds@gmail.com> writes:

Show 5 quoted lines

> Kinda. But "--force --merge" makes no sense. --force discards all
> local changes by definition, which means you can't have conflicts and
> will not need --merge. I think this is the reason why we die() out
> when both are specified. So we need something like
> --discard-staged-changes-only...

At that point, I would have to say that we do not need anything. The use case is already covered with "git reset && git checkout -m", isn't it?

Thanks.

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