Merge branch 'master' into concurrentprogress
Conflicts: Command/Fsck.hs Messages.hs Remote/Directory.hs Remote/Git.hs Remote/Helper/Special.hs Types/Remote.hs debian/changelog git-annex.cabal
This commit is contained in:
commit
e27b97d364
378 changed files with 4978 additions and 1158 deletions
|
@ -14,7 +14,7 @@ import qualified Command.Drop
|
|||
import qualified Command.Get
|
||||
import qualified Remote
|
||||
import Annex.Content
|
||||
import Config.NumCopies
|
||||
import Annex.NumCopies
|
||||
|
||||
cmd :: [Command]
|
||||
cmd = [withOptions mirrorOptions $ command "mirror" paramPaths seek
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue