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

Theodore Tso [off-list ref] writes:

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.

On Wed, Jun 25, 2008 at 01:50:06PM -0700, Junio C Hamano wrote:

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.

Stupid quesiton --- where is this documented?  I don't see this
documented either in the man page for git or git-checkout.

Regards,

						- Ted