Andrew's git / gitweb.git / diff
?
prune: add "--progress" to man page and usage msg
authorRobert P. J. Day <rpjday@crashcourse.ca>
Tue, 21 Nov 2017 15:51:52 +0000 (10:51 -0500)
committerJunio C Hamano <gitster@pobox.com>
Wed, 22 Nov 2017 03:29:30 +0000 (12:29 +0900)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-prune.txt patch | blob | history
builtin/prune.c patch | blob | history
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 7a493c80f776092265abd4fb2575639e683bcf5c..a37c0af9313e8e47806c89a584c70c09517244d1 100644 (file)
--- 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]
 SYNOPSIS
 --------
 [verse]
-'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]
+'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------
@@ -42,12 +42,15 @@ OPTIONS
 --verbose::
        Report all removed objects.
 
 --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>.
 
 
 --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
 <head>...::
        In addition to objects
        reachable from any of our references, keep objects
diff --git a/builtin/prune.c b/builtin/prune.c
index 8f4f0522856b988a8798fd65c6d81d8826709aa2..c2830d64e8d4c902ac552ebe0d5fcea5219368da 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -8,7 +8,7 @@
 #include "progress.h"
 
 static const char * const prune_usage[] = {
 #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;
        NULL
 };
 static int show_only;