mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into watch

Browse source
This commit is contained in:
Joey Hess 2012-06-04 12:07:59 -04:00
commit eab3872d91
231 changed files with 2786 additions and 1112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GitAnnex.hs
View file

@ -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