index 2bcc9491a3a985a62d86dc93d83b217f0220e3dc..bc1658434a61bdba41699859f103a3c8e0802d95 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
SYNOPSIS
--------
-'git-gc'
+'git-gc' [--prune]
DESCRIPTION
-----------
each repository to maintain good disk space utilization and good
operating performance.
+OPTIONS
+-------
+
+--prune::
+ Usually `git-gc` packs refs, expires old reflog entries,
+ packs loose objects,
+ and removes old 'rerere' records. Removal
+ of unreferenced loose objects is an unsafe operation
+ while other git operations are in progress, so it is not
+ done by default. Pass this option if you want it, and only
+ when you know nobody else is creating new objects in the
+ repository at the same time (e.g. never use this option
+ in a cron script).
+
+
Configuration
-------------
how long records of conflicted merge you have not resolved are
kept. This defaults to 15 days.
+The optional configuration variable 'gc.packrefs' determines if
+`git gc` runs `git-pack-refs`. Without the configuration, `git-pack-refs`
+is not run in bare repositories by default, to allow older dumb-transport
+clients fetch from the repository, but this will change in the future.
See Also
--------