summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-04 19:35:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-04 19:35:34 (GMT)
commit05584b2a4e18e0693ac2af6dd9650e59351786ed (patch)
tree7e3a0bf7846056881980eaaf270c976f7204e20d /Documentation
parent0335b647a21d7940e1faeefa380c1411374a45a6 (diff)
parent64a99eb4760de2ce2f0c04e146c0a55c34f50f20 (diff)
downloadgit-05584b2a4e18e0693ac2af6dd9650e59351786ed.zip
git-05584b2a4e18e0693ac2af6dd9650e59351786ed.tar.gz
git-05584b2a4e18e0693ac2af6dd9650e59351786ed.tar.bz2
Merge branch 'nd/gc-lock-against-each-other'
* nd/gc-lock-against-each-other: gc: reject if another gc is running, unless --force is given
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-gc.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 2402ed6..e158a3b 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -9,7 +9,7 @@ git-gc - Cleanup unnecessary files and optimize the local repository
SYNOPSIS
--------
[verse]
-'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune]
+'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force]
DESCRIPTION
-----------
@@ -72,6 +72,10 @@ automatic consolidation of packs.
--quiet::
Suppress all progress reports.
+--force::
+ Force `git gc` to run even if there may be another `git gc`
+ instance running on this repository.
+
Configuration
-------------