blob: 08fc6fb487c3b596d48cb5534c6108a3a3481362 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
{- git merging
-
- Copyright 2012 Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU GPL version 3 or higher.
-}
module Git.Merge where
import Common
import Git
import Git.Command
{- Avoids recent git's interactive merge. -}
mergeNonInteractive :: Ref -> Repo -> IO Bool
mergeNonInteractive branch = runBool "merge"
[Param "--no-edit", Param $ show branch]
|
