git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] prune: add "--progress" to man page and usage msg
@ 2017-11-21 15:51 Robert P. J. Day
  2017-11-22  3:29 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Robert P. J. Day @ 2017-11-21 15:51 UTC (permalink / raw)
  To: Git Mailing list

Add mention of git prune's "--progress" option to the SYNOPSIS and
DESCRIPTION sections of the man page, and to the usage message of "git
prune" itself.

While we're here, move the explanation of "--" toward the end of the
DESCRIPTION section, where it belongs.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 7a493c80f..a37c0af93 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -9,7 +9,7 @@ git-prune - Prune all unreachable objects from the object database
 SYNOPSIS
 --------
 [verse]
-'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]
+'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]

 DESCRIPTION
 -----------
@@ -42,12 +42,15 @@ OPTIONS
 --verbose::
 	Report all removed objects.

-\--::
-	Do not interpret any more arguments as options.
+--progress::
+	Show progress.

 --expire <time>::
 	Only expire loose objects older than <time>.

+\--::
+	Do not interpret any more arguments as options.
+
 <head>...::
 	In addition to objects
 	reachable from any of our references, keep objects
diff --git a/builtin/prune.c b/builtin/prune.c
index cddabf26a..d2fdae680 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -8,7 +8,7 @@
 #include "progress.h"

 static const char * const prune_usage[] = {
-	N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
+	N_("git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"),
 	NULL
 };
 static int show_only;

-- 

========================================================================
Robert P. J. Day                                 Ottawa, Ontario, CANADA
                        http://crashcourse.ca

Twitter:                                       http://twitter.com/rpjday
LinkedIn:                               http://ca.linkedin.com/in/rpjday
========================================================================

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] prune: add "--progress" to man page and usage msg
  2017-11-21 15:51 [PATCH] prune: add "--progress" to man page and usage msg Robert P. J. Day
@ 2017-11-22  3:29 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-11-22  3:29 UTC (permalink / raw)
  To: Robert P. J. Day; +Cc: Git Mailing list

"Robert P. J. Day" <rpjday@crashcourse.ca> writes:

> Add mention of git prune's "--progress" option to the SYNOPSIS and
> DESCRIPTION sections of the man page, and to the usage message of "git
> prune" itself.
>
> While we're here, move the explanation of "--" toward the end of the
> DESCRIPTION section, where it belongs.

Thanks, both changes make sense.  Will queue.

>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
>
> ---
>
> diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
> index 7a493c80f..a37c0af93 100644
> --- a/Documentation/git-prune.txt
> +++ b/Documentation/git-prune.txt
> @@ -9,7 +9,7 @@ git-prune - Prune all unreachable objects from the object database
>  SYNOPSIS
>  --------
>  [verse]
> -'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]
> +'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
>
>  DESCRIPTION
>  -----------
> @@ -42,12 +42,15 @@ OPTIONS
>  --verbose::
>  	Report all removed objects.
>
> -\--::
> -	Do not interpret any more arguments as options.
> +--progress::
> +	Show progress.
>
>  --expire <time>::
>  	Only expire loose objects older than <time>.
>
> +\--::
> +	Do not interpret any more arguments as options.
> +
>  <head>...::
>  	In addition to objects
>  	reachable from any of our references, keep objects
> diff --git a/builtin/prune.c b/builtin/prune.c
> index cddabf26a..d2fdae680 100644
> --- a/builtin/prune.c
> +++ b/builtin/prune.c
> @@ -8,7 +8,7 @@
>  #include "progress.h"
>
>  static const char * const prune_usage[] = {
> -	N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
> +	N_("git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"),
>  	NULL
>  };
>  static int show_only;

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-22  3:29 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-21 15:51 [PATCH] prune: add "--progress" to man page and usage msg Robert P. J. Day
2017-11-22  3:29 ` 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).