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

convert all commands to work with optparse-applicative

Browse source 
Still no options though.
This commit is contained in:
Joey Hess 2015-07-08 15:08:02 -04:00
parent 3125da54f6
commit 6e5c1f8db3
99 changed files with 391 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Command/Merge.hs
View file

@ -14,10 +14,11 @@ import qualified Git.Branch
import Command.Sync (prepMerge, mergeLocal)
cmd :: Command
cmd = command "merge" paramNothing seek SectionMaintenance
cmd = command "merge" SectionMaintenance
"automatically merge changes from remotes"
paramNothing (withParams seek)
seek :: CommandSeek
seek :: CmdParams -> CommandSeek
seek ps = do
withNothing mergeBranch ps
withNothing mergeSynced ps