{"thread":{"id":"47273","subject":"[PATCH] prune: add \"--progress\" to man page and usage msg","startedAt":"2017-11-21T15:53:18Z","lastAt":"2017-11-22T03:29:59Z","messageCount":2,"participants":["Robert P. J. Day","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"333102","messageId":"alpine.LFD.2.21.1711211048400.8726@DESKTOP-1GPMCEJ","threadId":"47273","inReplyTo":null,"subject":"[PATCH] prune: add \"--progress\" to man page and usage msg","fromName":"Robert P. J. Day","fromEmail":"rpjday@crashcourse.ca","sentAt":"2017-11-21T15:51:52Z","receivedAt":"2017-11-21T15:53:18Z","isPatch":true,"sender":{"key":"rpjday@crashcourse.ca","avatar":"https://avatars.githubusercontent.com/u/226084077?v=4"},"body":"Add mention of git prune's \"--progress\" option to the SYNOPSIS and\nDESCRIPTION sections of the man page, and to the usage message of \"git\nprune\" itself.\n\nWhile we're here, move the explanation of \"--\" toward the end of the\nDESCRIPTION section, where it belongs.\n\nSigned-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n\n---\n\ndiff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\nindex 7a493c80f..a37c0af93 100644\n--- a/Documentation/git-prune.txt\n+++ b/Documentation/git-prune.txt\n@@ -9,7 +9,7 @@ git-prune - Prune all unreachable objects from the object database\n SYNOPSIS\n --------\n [verse]\n-'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]\n+'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n\n DESCRIPTION\n -----------\n@@ -42,12 +42,15 @@ OPTIONS\n --verbose::\n \tReport all removed objects.\n\n-\\--::\n-\tDo not interpret any more arguments as options.\n+--progress::\n+\tShow progress.\n\n --expire <time>::\n \tOnly expire loose objects older than <time>.\n\n+\\--::\n+\tDo not interpret any more arguments as options.\n+\n <head>...::\n \tIn addition to objects\n \treachable from any of our references, keep objects\ndiff --git a/builtin/prune.c b/builtin/prune.c\nindex cddabf26a..d2fdae680 100644\n--- a/builtin/prune.c\n+++ b/builtin/prune.c\n@@ -8,7 +8,7 @@\n #include \"progress.h\"\n\n static const char * const prune_usage[] = {\n-\tN_(\"git prune [-n] [-v] [--expire <time>] [--] [<head>...]\"),\n+\tN_(\"git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\"),\n \tNULL\n };\n static int show_only;\n\n-- \n\n========================================================================\nRobert P. J. Day                                 Ottawa, Ontario, CANADA\n                        http://crashcourse.ca\n\nTwitter:                                       http://twitter.com/rpjday\nLinkedIn:                               http://ca.linkedin.com/in/rpjday\n========================================================================\n"},{"id":"333231","messageId":"xmqqd14bvvm7.fsf@gitster.mtv.corp.google.com","threadId":"47273","inReplyTo":"alpine.LFD.2.21.1711211048400.8726@DESKTOP-1GPMCEJ","subject":"Re: [PATCH] prune: add \"--progress\" to man page and usage msg","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-22T03:29:52Z","receivedAt":"2017-11-22T03:29:59Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Robert P. J. Day\" <rpjday@crashcourse.ca> writes:\n\n> Add mention of git prune's \"--progress\" option to the SYNOPSIS and\n> DESCRIPTION sections of the man page, and to the usage message of \"git\n> prune\" itself.\n>\n> While we're here, move the explanation of \"--\" toward the end of the\n> DESCRIPTION section, where it belongs.\n\nThanks, both changes make sense.  Will queue.\n\n>\n> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>\n>\n> ---\n>\n> diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt\n> index 7a493c80f..a37c0af93 100644\n> --- a/Documentation/git-prune.txt\n> +++ b/Documentation/git-prune.txt\n> @@ -9,7 +9,7 @@ git-prune - Prune all unreachable objects from the object database\n>  SYNOPSIS\n>  --------\n>  [verse]\n> -'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]\n> +'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n>\n>  DESCRIPTION\n>  -----------\n> @@ -42,12 +42,15 @@ OPTIONS\n>  --verbose::\n>  \tReport all removed objects.\n>\n> -\\--::\n> -\tDo not interpret any more arguments as options.\n> +--progress::\n> +\tShow progress.\n>\n>  --expire <time>::\n>  \tOnly expire loose objects older than <time>.\n>\n> +\\--::\n> +\tDo not interpret any more arguments as options.\n> +\n>  <head>...::\n>  \tIn addition to objects\n>  \treachable from any of our references, keep objects\n> diff --git a/builtin/prune.c b/builtin/prune.c\n> index cddabf26a..d2fdae680 100644\n> --- a/builtin/prune.c\n> +++ b/builtin/prune.c\n> @@ -8,7 +8,7 @@\n>  #include \"progress.h\"\n>\n>  static const char * const prune_usage[] = {\n> -\tN_(\"git prune [-n] [-v] [--expire <time>] [--] [<head>...]\"),\n> +\tN_(\"git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\"),\n>  \tNULL\n>  };\n>  static int show_only;\n"}]}