Merge branch 'duplicate'

Conflicts:
	debian/changelog

doc/git-annex.mdwn

@@ -190,6 +190,28 @@ subdirectories).
 
 	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.)
+
+  To not delete files from the import location, use the
+  --duplicate option. This could allow importing the same files repeatedly
+  to different locations in a repository. More likely, it could be used to
+  import the same files to a number of different branches or separate git
+  repositories.
+
+  To only import files whose content has not been seen before by git-annex,
+  use the --deduplicate option. 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
+  are deleted.
+  
+  (Note that using --deduplicate or --clean-duplicates with the WORM
+  backend does not look at file content, but filename and mtime.)
+
 * importfeed [url ...]
 
   Imports the contents of podcast feeds. Only downloads files whose

doc/related_software.mdwn

@@ -9,3 +9,4 @@ designed to interoperate with it.
   is git-annex aware.
 * [sizes](http://hackage.haskell.org/package/sizes) is another du-like
   utility, with a `-A` switch that enables git-annex support.
+* Emacs Org mode can auto-commit attached files to git-annex.