From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Nov 2017 03:29:52 GMT
Subject: Re: [PATCH] prune: add "--progress" to man page and usage msg
Message-ID: <xmqqd14bvvm7.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <alpine.LFD.2.21.1711211048400.8726@DESKTOP-1GPMCEJ>

"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;