summaryrefslogtreecommitdiff
path: root/Documentation/git-prune.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-08-09 13:05:47 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-09 13:05:47 -0700
commit0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f (patch)
tree3266384afc1dc4717f49b1bd77f9ab734cacf8a0 /Documentation/git-prune.txt
parentMerge branch 'webrick' of git://git.bogomips.org/git-svn (diff)
parentgitweb: clarify search results page when no matching commit found (diff)
downloadtgif-0d0ba03a18a9c6cbc3d55c1b6834b9c3824f823f.tar.xz
Merge branch 'maint'
* maint: gitweb: clarify search results page when no matching commit found Documentation: add a FILES section for show-ref Makefile: add missing dependency on http.h Makefile: add missing dependencies on url.h Documentation/git-log: Clarify --full-diff git-rebase: fix typo when parsing --force-rebase imap-send: Fix sprintf usage prune: allow --dry-run for -n and --verbose for -v notes: allow --dry-run for -n and --verbose for -v Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -C Documentation: cite git-am from git-apply t7003: fix subdirectory-filter test Allow "check-ref-format --branch" from subdirectory check-ref-format: handle subcommands in separate functions pretty-options.txt: match --format's documentation with implementation.
Diffstat (limited to 'Documentation/git-prune.txt')
-rw-r--r--Documentation/git-prune.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 15cfb7a8dc..4d673a5686 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -31,10 +31,12 @@ OPTIONS
-------
-n::
+--dry-run::
Do not remove anything; just report what it would
remove.
-v::
+--verbose::
Report all removed objects.
\--::