From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 07 Aug 2009 08:15:01 GMT
Subject: Re: [PATCH] git-ls-files.txt: clarify what "other files" mean for --other
Message-ID: <vpqprb8xcoq.fsf@bauges.imag.fr>
In-Reply-To: <7vmy6cfz9j.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@imag.fr> writes:
>
>> Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
>> ---
>> Actually, if it was not about backward compatibility, I'd just replace
>> -o, --other with -u, --untracked and talk about "untracked" everywhere,
>> but compatibility matters more than consistancy for plumbing.
>
> "ls-files -u" talks about (u)nmerged files.

(forgot this, so -u is even less an option)

> What consistency did you have in mind?

I found no place outside git ls-files where Git talks about "other"
files. Everywhere else, it talks about Untracked files.

As for the -u option, git status/commit -u[mode] is for Untracked
files, not unmerged ones.

--
Matthieu