Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

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

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:49

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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help