diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-21 16:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-21 16:30:16 -0400 |
| commit | 19fde4960dc1d6c8c05efd0f5b4293c2fb52ebf9 (patch) | |
| tree | 81071cf95d64b2c3f2d206d6dc30b6154a524b22 /git-annex.hs | |
| parent | a68e36f518589bd15fea32da273ad6fd2f288bb5 (diff) | |
new fromkey subcommand, for registering urls, etc0.01
had to redo Annex monad's flag storage
Diffstat (limited to 'git-annex.hs')
| -rw-r--r-- | git-annex.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-annex.hs b/git-annex.hs index 71a21379d..602f672c5 100644 --- a/git-annex.hs +++ b/git-annex.hs @@ -15,8 +15,8 @@ main = do args <- getArgs gitrepo <- Git.repoFromCwd state <- Annex.new gitrepo allBackends - (flags, actions) <- parseCmd args state - tryRun state $ [startup flags] ++ actions ++ [shutdown] + (configure, actions) <- parseCmd args state + tryRun state $ [startup] ++ configure ++ actions ++ [shutdown] {- Runs a list of Annex actions. Catches IO errors and continues - (but explicitly thrown errors terminate the whole command). |