* [PATCH] git-ls-files.txt: clarify what "other files" mean for --other
@ 2009-08-06 15:11 Matthieu Moy
2009-08-06 20:44 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Matthieu Moy @ 2009-08-06 15:11 UTC (permalink / raw)
To: git, gitster; +Cc: 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-ls-files.txt: clarify what "other files" mean for --other
2009-08-06 15:11 [PATCH] git-ls-files.txt: clarify what "other files" mean for --other Matthieu Moy
@ 2009-08-06 20:44 ` Junio C Hamano
2009-08-07 8:15 ` Matthieu Moy
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2009-08-06 20:44 UTC (permalink / raw)
To: Matthieu Moy; +Cc: git, gitster
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-ls-files.txt: clarify what "other files" mean for --other
2009-08-06 20:44 ` Junio C Hamano
@ 2009-08-07 8:15 ` Matthieu Moy
0 siblings, 0 replies; 3+ messages in thread
From: Matthieu Moy @ 2009-08-07 8:15 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-08-07 8:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-06 15:11 [PATCH] git-ls-files.txt: clarify what "other files" mean for --other Matthieu Moy
2009-08-06 20:44 ` Junio C Hamano
2009-08-07 8:15 ` Matthieu Moy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).