* [PATCH] Documentation: improve git ls-files -s manpage entry
@ 2017-03-31 19:47 Mostyn Bramley-Moore
2017-04-01 2:21 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Mostyn Bramley-Moore @ 2017-03-31 19:47 UTC (permalink / raw)
To: git; +Cc: Mostyn Bramley-Moore
List the fields in order of appearance in the command output.
Signed-off-by: Mostyn Bramley-Moore <mostyn@antipode.se>
---
Documentation/git-ls-files.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 1cab703..a9149fc 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -57,7 +57,8 @@ OPTIONS
-s::
--stage::
- Show staged contents' object name, mode bits and stage number in the output.
+ Show staged contents' mode bits, hash, stage number as well as the
+ object name in the output.
--directory::
If a whole directory is classified as "other", show just its
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Documentation: improve git ls-files -s manpage entry
2017-03-31 19:47 [PATCH] Documentation: improve git ls-files -s manpage entry Mostyn Bramley-Moore
@ 2017-04-01 2:21 ` Junio C Hamano
2017-04-01 7:08 ` [PATCH v2] " Mostyn Bramley-Moore
0 siblings, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2017-04-01 2:21 UTC (permalink / raw)
To: Mostyn Bramley-Moore; +Cc: git
Mostyn Bramley-Moore <mostyn@antipode.se> writes:
> List the fields in order of appearance in the command output.
>
> Signed-off-by: Mostyn Bramley-Moore <mostyn@antipode.se>
> ---
> Documentation/git-ls-files.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
> index 1cab703..a9149fc 100644
> --- a/Documentation/git-ls-files.txt
> +++ b/Documentation/git-ls-files.txt
> @@ -57,7 +57,8 @@ OPTIONS
>
> -s::
> --stage::
> - Show staged contents' object name, mode bits and stage number in the output.
> + Show staged contents' mode bits, hash, stage number as well as the
> + object name in the output.
This is not an improvement, as the word "hash" is merely a
colloquial way to say what is officially known as "object name".
If the patch were only to swap "mode bits" and "object name" without
doing anything else, it may have been an improvement, though. It is
implied that the path the output line talks about is shown, and that
is why we do not say "mode bits, object name, stage number and the
pathname".
>
> --directory::
> If a whole directory is classified as "other", show just its
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] Documentation: improve git ls-files -s manpage entry
2017-04-01 2:21 ` Junio C Hamano
@ 2017-04-01 7:08 ` Mostyn Bramley-Moore
2017-04-01 18:16 ` Junio C Hamano
0 siblings, 1 reply; 4+ messages in thread
From: Mostyn Bramley-Moore @ 2017-04-01 7:08 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Mostyn Bramley-Moore
List the fields in order of appearance in the command output.
Signed-off-by: Mostyn Bramley-Moore <mostyn@antipode.se>
---
Documentation/git-ls-files.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 1cab703..d153c17 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -57,7 +57,7 @@ OPTIONS
-s::
--stage::
- Show staged contents' object name, mode bits and stage number in the output.
+ Show staged contents' mode bits, object name and stage number in the output.
--directory::
If a whole directory is classified as "other", show just its
--
2.9.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Documentation: improve git ls-files -s manpage entry
2017-04-01 7:08 ` [PATCH v2] " Mostyn Bramley-Moore
@ 2017-04-01 18:16 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2017-04-01 18:16 UTC (permalink / raw)
To: Mostyn Bramley-Moore; +Cc: git
Thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-01 18:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-31 19:47 [PATCH] Documentation: improve git ls-files -s manpage entry Mostyn Bramley-Moore
2017-04-01 2:21 ` Junio C Hamano
2017-04-01 7:08 ` [PATCH v2] " Mostyn Bramley-Moore
2017-04-01 18:16 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).