diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 17:26:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 17:26:34 -0400 |
| commit | b1acf41036a1eddea29cc69c6b2a595582378465 (patch) | |
| tree | 33025d13ac8c7d8cd0c7ccdf1eda5773e0829fc5 /doc/git-annex.mdwn | |
| parent | d70e9a945b4ac44ff42872b08dcf09051759eb9c (diff) | |
update documentation that mentioned .git-annex/
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 12756d802..ced6fc1b3 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -497,18 +497,6 @@ These files are used by git-annex, in your git repository: `.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 -descriptions. - -`.git-annex/trust.log` is used to indicate which repositories are trusted -and untrusted. - -`.git-annex/*.log` is where git-annex records its content tracking -information. These files should be committed to git. - -`.gitattributes` is configured to use git's union merge driver -to avoid conflicts when merging files in the `.git-annex` directory. - # SEE ALSO Most of git-annex's documentation is available on its web site, |