Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 25, 2008, 20:50 UTC
Message-ID: <7v8wwtz1c1.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20080625203822.GA7827@mit.edu>

Theodore Tso <tytso@mit.edu> writes:

Show 5 quoted lines

> The one thing I would worry about is the potential ambiguity if you do
> something like "git checkout FOOBAR", and FOOBAR was both a branch
> name as well as a file name.  How should it be interpreted?  I'd argue
> the real problem was we conflated two distinct operations: "switching
> to a new branch", and "reverting a file" to the same name, checkout.

I just replied to Avery about that. -- is always the way to disambiguate between refs (that come before --) and paths (that come after --), not limited to "git checkout" but with other commands such as "git log", "git diff", etc.

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