mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-26 03:36:25 +02:00
Code

Merge branch 'rd/man-prune-progress' 

Doc update.

* rd/man-prune-progress:
  prune: add "--progress" to man page and usage msg
This commit is contained in:
Junio C Hamano 2017-12-06 09:23:39 -08:00
parent e8b96bd053 1a1fc2d5b5
commit c3d2d34fbf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-prune.txt
View File

@ -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

2
builtin/prune.c
View File

@ -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;