add merge subcommand

2 files changed, 30 insertions, 1 deletions

diff --git a/Command/Merge.hs b/Command/Merge.hs
new file mode 100644
index 000000000..04328e8c5
--- /dev/null
+++ b/Command/Merge.hs
@@ -0,0 +1,29 @@
+{- git-annex command
+ -
+ - Copyright 2011 Joey Hess <joey@kitenet.net>
+ -
+ - Licensed under the GNU GPL version 3 or higher.
+ -}
+
+module Command.Merge where
+
+import Command
+import qualified Branch
+import Messages
+
+command :: [Command]
+command = [repoCommand "merge" paramNothing seek
+		"auto-merges remote changes into the git-annex branch"]
+
+seek :: [CommandSeek]
+seek = [withNothing start]
+
+start :: CommandStartNothing
+start = do
+	showStart "merge" "."
+	next perform
+
+perform :: CommandPerform
+perform = do
+	Branch.update
+	next $ return True
diff --git a/Command/Status.hs b/Command/Status.hs
index 1a7f694ba..3b096d979 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -47,7 +47,7 @@ sizeList :: [a] -> SizeList a
 sizeList l = (l, genericLength l)
 
 command :: [Command]
-command = [repoCommand "status" (paramNothing) seek
+command = [repoCommand "status" paramNothing seek
 	"shows status information about the annex"]
 
 seek :: [CommandSeek]