summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-10-14 18:23:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-10-14 18:23:17 -0400
commitae2b1308a62981e14a03275e5d6ea65a2bc7d098 (patch)
treeb41f88e8c429509753af1d8beecc218e3ed7cb42
parent9fa92141064a7682e1559bfa91a360c1ad5cb3dc (diff)
reorg
-rw-r--r--doc/git-annex.mdwn28
1 files changed, 14 insertions, 14 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index eefedbfbf..1b8464b31 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -477,6 +477,20 @@ Here are all the supported configuration settings.
Space-separated list of names of the key-value backends to use.
The first listed is used to store new files by default.
+* `annex.diskreserve`
+
+ Amount of disk space to reserve. Disk space is checked when transferring
+ content to avoid running out, and additional free space can be reserved
+ via this option, to make space for more important content (such as git
+ commit logs). Can be specified with any commonly used units, for example,
+ "0.5 gb" or "100 KiloBytes"
+
+ The default reserve is 1 megabyte.
+
+* `annex.version`
+
+ Automatically maintained, and used to automate upgrades between versions.
+
* `remote.<name>.annex-cost`
When determining which repository to
@@ -532,20 +546,6 @@ Here are all the supported configuration settings.
Default ssh, rsync, and bup options to use if a remote does not have
specific options.
-* `annex.diskreserve`
-
- Amount of disk space to reserve. Disk space is checked when transferring
- content to avoid running out, and additional free space can be reserved
- via this option, to make space for more important content (such as git
- commit logs). Can be specified with any commonly used units, for example,
- "0.5 gb" or "100 KiloBytes"
-
- The default reserve is 1 megabyte.
-
-* `annex.version`
-
- Automatically maintained, and used to automate upgrades between versions.
-
* `remote.<name>.buprepo`
Used by bup special remotes, this configures