blob: 832cde51273d5a64a56f648af4391ae6bdabd64f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
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-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
|
