From: Avery Pennarun Date: Wed, 25 Jun 2008 20:58:09 GMT Subject: Re: [PATCH] cmd_reset: don't trash uncommitted changes unless told to Message-ID: <32541b130806251358n3ab6cfc8y7a90d898b9308e12@mail.gmail.com> In-Reply-To: <7vd4m5z1f8.fsf@gitster.siamese.dyndns.org> On 6/25/08, Junio C Hamano wrote: > "Avery Pennarun" writes: > >> * 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. Oops, I got mixed up. Only git-reset requires the --. Would it make sense to bring git-reset into line with everything else, then? Thanks, Avery