Merge branch 'master' into desymlink

This commit is contained in:
Joey Hess 2012-12-13 00:46:10 -04:00
commit ffdd08fd2e
33 changed files with 97 additions and 100 deletions

View file

@ -415,7 +415,7 @@ rsyncParams r = do
o <- getRemoteConfig r "rsync-options" ""
return $ options ++ map Param (words o)
where
-- --inplace to resume partial files
-- --inplace to resume partial files
options = [Params "-p --progress --inplace"]
commitOnCleanup :: Git.Repo -> Annex a -> Annex a