diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-15 01:29:50 +0200 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-15 01:29:50 +0200 |
| commit | 1dde0ee7918e1200422fbb922e7b633940e7bf77 (patch) | |
| tree | 51df051708c7412e2d45f0109ba6c82247ee6fae /doc/git-annex.mdwn | |
| parent | aea8654ac4584c054ff4389712a842407f16819a (diff) | |
wording
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 2437de488..314a34937 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -192,7 +192,8 @@ subdirectories). By default, importing two files with the same contents from two different locations will result in both files being added to the repository. - (With most backends, only one copy of the data will be stored.) + (With all checksumming backends, including the default SHA256E, + only one copy of the data will be stored.) To not delete files from the import location, use the --duplicate option. This could allow importing the same files repeatedly @@ -201,8 +202,8 @@ subdirectories). repositories. The --deduplicate option can be used to alter this behavior, making - files whose content has already been seen by git-annex not be added - to the repository, but just be deleted. + only files whose content has been seen before by git-annex be added + to the repository. Duplicate files will be deleted from the import location. The --clean-duplicates option does not import any new files, but any files found in the import location that are duplicates of content in the annex |