* Re: [PATCH 1/5] status: document the -v/--verbose option
@ 2015-04-24 0:27 Pete Harlan
2015-04-24 1:44 ` Junio C Hamano
2015-04-24 16:46 ` Michael Haggerty
0 siblings, 2 replies; 5+ messages in thread
From: Pete Harlan @ 2015-04-24 0:27 UTC (permalink / raw)
To: Junio C Hamano, Michael Haggerty; +Cc: git, Michael J Gruber
Junio writes:
> Michael Haggerty <mhagger@alum.mit.edu> writes:
>
> > Document `git status -v`, including its new doubled `-vv` form.
> >
> > Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> >---
>
> Will queue on mg/status-v-v series, which did add description for
> "commit -v", but "status -v" did not have the description to begin
> with and we missed it.
[...]
> > +-v::
> > +--verbose::
> > + In addition to the names of files that have been changed, also
> > + show the textual changes that are staged to be committed
> > + (i.e., like the output of `git diff`). If `-v` is specified
Should this be `git diff --cached`?
> > + twice, then also show the changes in the working tree that
> > + have not yet been staged (i.e., like the output of `git diff
> > + --cached`).
...and should this just be `git diff`?
--Pete
(Sorry for not replying to the email; bit of a mess here in my setup.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/5] status: document the -v/--verbose option
2015-04-24 0:27 [PATCH 1/5] status: document the -v/--verbose option Pete Harlan
@ 2015-04-24 1:44 ` Junio C Hamano
2015-04-24 16:46 ` Michael Haggerty
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2015-04-24 1:44 UTC (permalink / raw)
To: Pete Harlan; +Cc: Michael Haggerty, git, Michael J Gruber
Pete Harlan <pchpublic88@gmail.com> writes:
> Junio writes:
>> Michael Haggerty <mhagger@alum.mit.edu> writes:
>>
>> > Document `git status -v`, including its new doubled `-vv` form.
>> >
>> > Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
>> >---
>>
>> Will queue on mg/status-v-v series, which did add description for
>> "commit -v", but "status -v" did not have the description to begin
>> with and we missed it.
> [...]
>> > +-v::
>> > +--verbose::
>> > + In addition to the names of files that have been changed, also
>> > + show the textual changes that are staged to be committed
>> > + (i.e., like the output of `git diff`). If `-v` is specified
>
> Should this be `git diff --cached`?
>
>> > + twice, then also show the changes in the working tree that
>> > + have not yet been staged (i.e., like the output of `git diff
>> > + --cached`).
>
> ...and should this just be `git diff`?
>
> --Pete
>
> (Sorry for not replying to the email; bit of a mess here in my setup.)
Duh!
I see "git commit" documentation does not have these extra "like the
output of..." bits. Perhaps we can do without it for the sake of
both brevity and risk avoidance?
Will push out with --cached bit swapped for tonight on 'pu'.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/5] status: document the -v/--verbose option
2015-04-24 0:27 [PATCH 1/5] status: document the -v/--verbose option Pete Harlan
2015-04-24 1:44 ` Junio C Hamano
@ 2015-04-24 16:46 ` Michael Haggerty
1 sibling, 0 replies; 5+ messages in thread
From: Michael Haggerty @ 2015-04-24 16:46 UTC (permalink / raw)
To: Pete Harlan, Junio C Hamano; +Cc: git, Michael J Gruber
On 04/24/2015 02:27 AM, Pete Harlan wrote:
> Junio writes:
>> Michael Haggerty <mhagger@alum.mit.edu> writes:
>>
>>> Document `git status -v`, including its new doubled `-vv` form.
>>>
>>> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
>>> ---
>>
>> Will queue on mg/status-v-v series, which did add description for
>> "commit -v", but "status -v" did not have the description to begin
>> with and we missed it.
> [...]
>>> +-v::
>>> +--verbose::
>>> + In addition to the names of files that have been changed, also
>>> + show the textual changes that are staged to be committed
>>> + (i.e., like the output of `git diff`). If `-v` is specified
>
> Should this be `git diff --cached`?
>
>>> + twice, then also show the changes in the working tree that
>>> + have not yet been staged (i.e., like the output of `git diff
>>> + --cached`).
>
> ...and should this just be `git diff`?
Yes, you're right. Thanks for catching this, Pete. The shorter the
patch, the higher the error density :-(
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 0/5] Tweak the 2.4.0 release notes and related docs
@ 2015-04-23 12:27 Michael Haggerty
2015-04-23 12:27 ` [PATCH 1/5] status: document the -v/--verbose option Michael Haggerty
0 siblings, 1 reply; 5+ messages in thread
From: Michael Haggerty @ 2015-04-23 12:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Michael Haggerty
Patches 1 and 2 add some manpage documentation for features mentioned
in the release notes that were not adequately documented.
Patches 3 and 4 correct a couple of concrete problems in the release
notes.
Patch 5 is a smörgåsbord of suggested stylistic changes to the release
notes. Feel free to pick and choose the ones that you think are
improvements.
Michael Haggerty (5):
status: document the -v/--verbose option
git tag: mention versionsort.prereleaseSuffix in manpage
RelNotes: correct name of versionsort.prereleaseSuffix
RelNotes: refer to the rebase -i "todo list", not "insn sheet"
RelNotes: wordsmithing
Documentation/RelNotes/2.4.0.txt | 338 ++++++++++++++++++++-------------------
Documentation/git-status.txt | 9 ++
Documentation/git-tag.txt | 11 +-
3 files changed, 189 insertions(+), 169 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/5] status: document the -v/--verbose option
2015-04-23 12:27 [PATCH 0/5] Tweak the 2.4.0 release notes and related docs Michael Haggerty
@ 2015-04-23 12:27 ` Michael Haggerty
2015-04-23 18:26 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Michael Haggerty @ 2015-04-23 12:27 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Michael Haggerty
Document `git status -v`, including its new doubled `-vv` form.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
Documentation/git-status.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index b3319f7..9ec5897 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -41,6 +41,15 @@ OPTIONS
--long::
Give the output in the long-format. This is the default.
+-v::
+--verbose::
+ In addition to the names of files that have been changed, also
+ show the textual changes that are staged to be committed
+ (i.e., like the output of `git diff`). If `-v` is specified
+ twice, then also show the changes in the working tree that
+ have not yet been staged (i.e., like the output of `git diff
+ --cached`).
+
-u[<mode>]::
--untracked-files[=<mode>]::
Show untracked files.
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/5] status: document the -v/--verbose option
2015-04-23 12:27 ` [PATCH 1/5] status: document the -v/--verbose option Michael Haggerty
@ 2015-04-23 18:26 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2015-04-23 18:26 UTC (permalink / raw)
To: Michael Haggerty; +Cc: git, Michael J Gruber
Michael Haggerty <mhagger@alum.mit.edu> writes:
> Document `git status -v`, including its new doubled `-vv` form.
>
> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
> ---
Will queue on mg/status-v-v series, which did add description for
"commit -v", but "status -v" did not have the description to begin
with and we missed it.
Thanks.
> Documentation/git-status.txt | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
> index b3319f7..9ec5897 100644
> --- a/Documentation/git-status.txt
> +++ b/Documentation/git-status.txt
> @@ -41,6 +41,15 @@ OPTIONS
> --long::
> Give the output in the long-format. This is the default.
>
> +-v::
> +--verbose::
> + In addition to the names of files that have been changed, also
> + show the textual changes that are staged to be committed
> + (i.e., like the output of `git diff`). If `-v` is specified
> + twice, then also show the changes in the working tree that
> + have not yet been staged (i.e., like the output of `git diff
> + --cached`).
> +
> -u[<mode>]::
> --untracked-files[=<mode>]::
> Show untracked files.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-24 16:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-24 0:27 [PATCH 1/5] status: document the -v/--verbose option Pete Harlan
2015-04-24 1:44 ` Junio C Hamano
2015-04-24 16:46 ` Michael Haggerty
-- strict thread matches above, loose matches on Subject: below --
2015-04-23 12:27 [PATCH 0/5] Tweak the 2.4.0 release notes and related docs Michael Haggerty
2015-04-23 12:27 ` [PATCH 1/5] status: document the -v/--verbose option Michael Haggerty
2015-04-23 18:26 ` Junio C Hamano
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).