29 lines
536 B
Haskell
29 lines
536 B
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.Merge where
|
|
|
|
import AnnexCommon
|
|
import Command
|
|
import qualified Branch
|
|
|
|
command :: [Command]
|
|
command = [repoCommand "merge" paramNothing seek
|
|
"auto-merge remote changes into git-annex branch"]
|
|
|
|
seek :: [CommandSeek]
|
|
seek = [withNothing start]
|
|
|
|
start :: CommandStart
|
|
start = do
|
|
showStart "merge" "."
|
|
next perform
|
|
|
|
perform :: CommandPerform
|
|
perform = do
|
|
Branch.update
|
|
next $ return True
|