[PATCH] git-ls-files.txt: clarify what "other files" mean for --other

[PATCH] git-ls-files.txt: clarify what "other files" mean for --other

[Matthieu Moy]

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.

 Documentation/git-ls-files.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 057a021..021066e 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -44,7 +44,7 @@ OPTIONS
 
 -o::
 --others::
-	Show other files in the output
+	Show other (i.e. untracked) files in the output
 
 -i::
 --ignored::
-- 
1.6.4.55.gc63c6.dirty

Re: [PATCH] git-ls-files.txt: clarify what "other files" mean for --other

[Junio C Hamano]

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.  What consistency did you have
in mind?

Re: [PATCH] git-ls-files.txt: clarify what "other files" mean for --other

[Matthieu Moy]

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