diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:23:39 -0800 |
| commit | c3d2d34fbf64c1d39e8bec03fea85ef14aeda692 (patch) | |
| tree | ec477644f3cef2cb96bded8971a03b07d7513a4c | |
| parent | Merge branch 'jt/submodule-tests-cleanup' (diff) | |
| parent | prune: add "--progress" to man page and usage msg (diff) | |
| download | git-c3d2d34fbf64c1d39e8bec03fea85ef14aeda692.tar.gz git-c3d2d34fbf64c1d39e8bec03fea85ef14aeda692.zip | |
Merge branch 'rd/man-prune-progress'
Doc update.
* rd/man-prune-progress:
prune: add "--progress" to man page and usage msg
| -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 7a493c80f7..a37c0af931 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 cddabf26a9..d2fdae680a 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; |