summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-27 13:57:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-27 13:57:56 -0400
commitfaf55ac2b702de1e4f2f308f87bb22284a2bc128 (patch)
tree49115aebe45ca5c8f4c4919f6dbefc8516fa6b46
parent2bf3addf4997023584e32812a9d8cbc46833d672 (diff)
update
-rw-r--r--doc/location_tracking.mdwn5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/location_tracking.mdwn b/doc/location_tracking.mdwn
index 85bb3d1b5..d40a7206f 100644
--- a/doc/location_tracking.mdwn
+++ b/doc/location_tracking.mdwn
@@ -1,8 +1,7 @@
git-annex keeps track of in which repositories it last saw a file's content.
This location tracking information is stored in the git-annex branch.
Repositories record their UUID and the date when they get or drop
-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.)
+a file's content.
This location tracking information is useful if you have multiple
repositories, and not all are always accessible. For example, perhaps one
@@ -10,7 +9,7 @@ is on a home file server, and you are away from home. Then git-annex can
tell you what git remote it needs access to in order to get a file:
# git annex get myfile
- get myfile(not available)
+ get myfile (not available)
I was unable to access these remotes: home
Another way the location tracking comes in handy is if you put repositories