diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-10-29 15:19:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-10-29 15:19:05 -0400 |
| commit | f97c783283847c6cc4516673fe638b4d551e671d (patch) | |
| tree | 3d9e96c4803f3310d82683f00c876f1d80c7be8e /Command/Merge.hs | |
| parent | 0d92aca1aabbbeb2d50d91807312ff6039971751 (diff) | |
clean up check selection code
This new approach allows filtering out checks from the default set that are
not appropriate for a command, rather than having to list every check
that is appropriate. It also reduces some boilerplate.
Haskell does not define Eq for functions, so I had to go a long way around
with each check having a unique id. Meh.
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 33d4c8ffc..c1f7e899a 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -11,8 +11,8 @@ import Common.Annex import Command import qualified Annex.Branch -command :: [Command] -command = [Command "merge" paramNothing defaultChecks seek +def :: [Command] +def = [command "merge" paramNothing seek "auto-merge remote changes into git-annex branch"] seek :: [CommandSeek] |