diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-13 00:45:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-13 00:45:09 -0400 |
| commit | 14d7b2ac13318ba513bbab4f08b98434741f0e12 (patch) | |
| tree | 18886135d5de49ed28c9c084010c57676ee54db8 /git-annex.mdwn | |
| parent | 208bba8d3062133733d27a5db521013e3a2ead57 (diff) | |
update
Diffstat (limited to 'git-annex.mdwn')
| -rw-r--r-- | git-annex.mdwn | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/git-annex.mdwn b/git-annex.mdwn index dd0b3bc07..6852ed008 100644 --- a/git-annex.mdwn +++ b/git-annex.mdwn @@ -79,10 +79,6 @@ only copies of a file. The `.git-annex` directory at the top of the repository is used to store git-annex information that should be propigated between repositories. -Data is stored here in files that are arranged to avoid conflicts in most -cases. A conflict could occur if a file with the same name but different -content was added to different repositories. - ## key/value storage git-annex uses a key/value abstraction layer to allow files contents to be |