diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-03-26 11:44:20 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-03-26 11:44:20 -0400 |
commit | 4267f36f058eb88b3d18613acee34d8eb4bb4e4f (patch) | |
tree | 0e0c416cb0ad7456dbe5f1818bca8182e8460fad /doc/git-annex-import.mdwn | |
parent | 71d824d16cd928693d149950a8eabf2652243350 (diff) |
improve import duplicate docs
Diffstat (limited to 'doc/git-annex-import.mdwn')
-rw-r--r-- | doc/git-annex-import.mdwn | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/doc/git-annex-import.mdwn b/doc/git-annex-import.mdwn index 4d2c05547..43e619607 100644 --- a/doc/git-annex-import.mdwn +++ b/doc/git-annex-import.mdwn @@ -13,11 +13,18 @@ the annex. Individual files to import can be specified. If a directory is specified, the entire directory is imported. git annex import /media/camera/DCIM/* - -By default, importing two files with the same contents from two different -locations will result in both files being added to the repository. -(With all checksumming backends, including the default SHA256E, -only one copy of the data will be stored.) + +When importing files, there's a possibility of importing a duplicate +of a file that is already known to git-annex -- its content is either +present in the local repository already, or git-annex knows of anther +repository that contains it. + +By default, importing a duplicate of a known file will result in +a new filename being added to the repository, so the duplicate file +is present in the repository twice. (With all checksumming backends, +including the default SHA256E, only one copy of the data will be stored.) + +Several options can be used to adjust handling of duplicate files. # OPTIONS @@ -32,19 +39,18 @@ only one copy of the data will be stored.) * `--deduplicate` - Only import files whose content has not been seen before by git-annex. - - Duplicate files will be deleted from the import location. + Only import files that are not duplicates; + duplicate files will be deleted from the import location. * `--skip-duplicates` - Only import files whose content has not been seen before by git-annex, - but avoid deleting duplicate files. + Only import files that are not duplicates; and avoid deleting + duplicate files from the import location. * `--clean-duplicates` Does not import any files, but any files found in the import location - that are duplicates of content in the annex are deleted. + that are duplicates are deleted. * file matching options |