From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Mar 2019 07:16:26 +0000 (+0900)
Subject: Merge branch 'rd/gc-prune-doc-fix'
X-Git-Tag: v2.22.0-rc0~150
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/443442ec71f31eb39de03557c49ef2c972a98baa?ds=inline;hp=-c

Merge branch 'rd/gc-prune-doc-fix'

Doxfix.

* rd/gc-prune-doc-fix:
docs/git-gc: fix typo "--prune=all" to "--prune=now"
---

443442ec71f31eb39de03557c49ef2c972a98baa
diff --combined Documentation/git-gc.txt
index a7442499f6,8a5df51641..a7c1b0f60e
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@@ -76,7 -76,7 +76,7 @@@ be performed as well
  --prune=<date>::
  	Prune loose objects older than date (default is 2 weeks ago,
  	overridable by the config variable `gc.pruneExpire`).
- 	--prune=all prunes loose objects regardless of their age and
+ 	--prune=now prunes loose objects regardless of their age and
  	increases the risk of corruption if another process is writing to
  	the repository concurrently; see "NOTES" below. --prune is on by
  	default.
@@@ -137,7 -137,7 +137,7 @@@ The optional configuration variable `gc
  it within all non-bare repos or it can be set to a boolean value.
  This defaults to true.
  
 -The optional configuration variable `gc.commitGraph` determines if
 +The optional configuration variable `gc.writeCommitGraph` determines if
  'git gc' should run 'git commit-graph write'. This can be set to a
  boolean value. This defaults to false.