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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 25, 2008, 20:48 UTC
Message-ID: <7vd4m5z1f8.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <32541b130806251322l478faa87gc9f2016254689022@mail.gmail.com>

"Avery Pennarun" <apenwarr@gmail.com> writes:

Show 6 quoted lines

>>   * You say "git checkout -- file" when you want to "check out the file
>>    from the index";
>
> The real question here is the --.  Is it strictly needed?  It's
> optional in things like git-diff, which just do their best to guess
> what you mean if you don't use the --.

No, I wrote -- only for clarity, because you can happen to have a branch whose name is the same as the file. Otherwise you can safely omit it, just like git-diff and any other commands that follow the -- convention.

I have a work tree that has an untracked file HEAD and master just to catch script breakages that forgets to place -- in appropriate places when they deal with user supplied pathnames.