summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-16 15:22:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-16 15:22:47 -0400
commit684011175cc75bb6a667e65ba0ec6cabd1f0897a (patch)
tree3aff0f72ac142c029444472122d919734e232b75
parenteed4a7fcdfbae821485d120055c8aec4824ecb3e (diff)
update
-rw-r--r--git-annex.mdwn19
1 files changed, 11 insertions, 8 deletions
diff --git a/git-annex.mdwn b/git-annex.mdwn
index 2796f48fb..bb216f038 100644
--- a/git-annex.mdwn
+++ b/git-annex.mdwn
@@ -40,16 +40,15 @@ Enough broad picture, here's how it actually looks:
if you're just done with a file; only use `unannex` if you
accidentially added a file.
-Oh yeah, "$file" in the above can be any number of files, or directories.
-git-annex automatically recurses into directories, but skips files that are
-checked into git (as well as skipping `.git` itself), so "git annex ." works
-fine.
+Oh yeah, "$file" in the above can be any number of files, or directories,
+same as you'd pass to "git add" or "git rm".
+So "git annex add ." or "git annex get dir/" work fine.
## copies
git-annex can be configured to try to keep N copies of a file's content
-available across all repositories. By default, N is 1 (configured by
-annex.numcopies).
+available across all repositories. By default, N is 1; it is configured by
+annex.numcopies.
`git annex drop` attempts to check with other git remotes, to check that N
copies of the file exist. If enough repositories cannot be verified to have
@@ -105,7 +104,11 @@ to store different files' contents in a given repository.
git-annex keeps track of on which repository it last saw a file's content.
This can be useful when using it for archiving with offline storage. When
you indicate you want a file, git-annex will tell you which repositories
-have the file's content.
+have the file's content. For example:
+
+ # git annex get myfile
+ git-annex: unable to get: myfile
+ To get that file, need access to one of these remotes: usbdrive
Location tracking information is stored in `.git-annex/$key.log`.
Repositories record their UUID and the date when they get or drop
@@ -113,7 +116,7 @@ a file's content. (Git is configured to use a union merge for this file,
so the lines may be in arbitrary order, but it will never conflict.)
The optional file `.git-annex/uuid.log` can be created to add a description
-to a UUID. If git-annex needs a file from a repository and it cannot find
+to a UUID. If git-annex needs a file from some repository, and it cannot find
the repository amoung the remotes, it will use the description from this
file when asking for the repository to be made available. The file format
is a UUID, a space, and the rest of the line is its description. For