diff options
| author | Robert P. J. Day <rpjday@crashcourse.ca> | 2017-11-21 10:51:52 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-22 12:29:30 +0900 |
| commit | 1a1fc2d5b5b84bc7a6c7ebe1cd8c8f7587314b59 (patch) | |
| tree | e1b22c8eb773503ee8eb9da04164149ab1b9e2c3 | |
| parent | 9752ad0bb79f680bca48db7adc45338b298304b0 (diff) | |
| download | git-1a1fc2d5b5b84bc7a6c7ebe1cd8c8f7587314b59.tar.gz git-1a1fc2d5b5b84bc7a6c7ebe1cd8c8f7587314b59.tar.xz | |
prune: add "--progress" to man page and usage msg
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>
| -rw-r--r-- | Documentation/git-prune.txt | 9 | ||||
| -rw-r--r-- | builtin/prune.c | 2 |
2 files changed, 7 insertions, 4 deletions
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 8f4f05228..c2830d64e 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; |