summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 80680820f..3bb3b0835 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -219,6 +219,8 @@ Here are all the supported configuration settings.
to talk to this repository.
* `annex.scp-options` and `annex.ssh-options` -- Default scp and ssh
options to use if a remote does not have specific options.
+* `annex.version` -- Automatically maintained, and used to automate upgrades
+ between versions.
The backend used when adding a new file to the annex can be configured
on a per-file-type basis via the `.gitattributes` file. In the file,
@@ -233,7 +235,7 @@ but the SHA1 backend for ogg files:
These files are used, in your git repository:
-`.git/annex/` contains the annexed file contents that are currently
+`.git/annex/objects/` contains the annexed file contents that are currently
available. Annexed files in your git repository symlink to that content.
`.git-annex/uuid.log` is used to map between repository UUID and