summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-06 17:23:39 (GMT)
commitc3d2d34fbf64c1d39e8bec03fea85ef14aeda692 (patch)
treeec477644f3cef2cb96bded8971a03b07d7513a4c /Documentation
parente8b96bd053524f1e77f35e6d12120a692a3e4844 (diff)
parent1a1fc2d5b5b84bc7a6c7ebe1cd8c8f7587314b59 (diff)
downloadgit-c3d2d34fbf64c1d39e8bec03fea85ef14aeda692.zip
git-c3d2d34fbf64c1d39e8bec03fea85ef14aeda692.tar.gz
git-c3d2d34fbf64c1d39e8bec03fea85ef14aeda692.tar.bz2
Merge branch 'rd/man-prune-progress'
Doc update. * rd/man-prune-progress: prune: add "--progress" to man page and usage msg
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-prune.txt9
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 7a493c8..a37c0af 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