diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-04 12:07:59 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-04 12:07:59 -0400 |
| commit | eab3872d9145e7733cf69d4e8c696ff075081081 (patch) | |
| tree | 57734bec5d1d3aa59c2fc4e07813298af44789db /GitAnnex.hs | |
| parent | d5ffd2d99d0da587e55b31994dae658c2bb6d9d9 (diff) | |
| parent | 619d765646a23d7f22ac8c0dd256be10a5a278f7 (diff) | |
Merge branch 'master' into watch
Diffstat (limited to 'GitAnnex.hs')
| -rw-r--r-- | GitAnnex.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/GitAnnex.hs b/GitAnnex.hs index 5caa93499..a4c5eb849 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -11,7 +11,7 @@ import System.Console.GetOpt import Common.Annex import qualified Git.Config -import qualified Git.Construct +import qualified Git.CurrentRepo import CmdLine import Command import Types.TrustLevel @@ -37,6 +37,7 @@ import qualified Command.InitRemote import qualified Command.Fsck import qualified Command.Unused import qualified Command.DropUnused +import qualified Command.AddUnused import qualified Command.Unlock import qualified Command.Lock import qualified Command.PreCommit @@ -53,6 +54,7 @@ import qualified Command.Semitrust import qualified Command.Dead import qualified Command.Sync import qualified Command.AddUrl +import qualified Command.Import import qualified Command.Map import qualified Command.Upgrade import qualified Command.Version @@ -69,6 +71,7 @@ cmds = concat , Command.Lock.def , Command.Sync.def , Command.AddUrl.def + , Command.Import.def , Command.Init.def , Command.Describe.def , Command.InitRemote.def @@ -87,6 +90,7 @@ cmds = concat , Command.Fsck.def , Command.Unused.def , Command.DropUnused.def + , Command.AddUnused.def , Command.Find.def , Command.Whereis.def , Command.Log.def @@ -133,4 +137,4 @@ header :: String header = "Usage: git-annex command [option ..]" run :: [String] -> IO () -run args = dispatch True args cmds options header Git.Construct.fromCurrent +run args = dispatch True args cmds options header Git.CurrentRepo.get |