diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:35:34 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:35:34 -0700 |
commit | 05584b2a4e18e0693ac2af6dd9650e59351786ed (patch) | |
tree | 7e3a0bf7846056881980eaaf270c976f7204e20d /Documentation/git-gc.txt | |
parent | 0335b647a21d7940e1faeefa380c1411374a45a6 (diff) | |
parent | 64a99eb4760de2ce2f0c04e146c0a55c34f50f20 (diff) | |
download | git-05584b2a4e18e0693ac2af6dd9650e59351786ed.tar.gz |
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/git-gc.txt')
-rw-r--r-- | Documentation/git-gc.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 2402ed6828..e158a3b31f 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 ------------- |