2012-06-23 14:22:56 +00:00
|
|
|
{- 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
|
2012-07-17 18:50:37 +00:00
|
|
|
import Git.Version
|
2012-06-23 14:22:56 +00:00
|
|
|
|
|
|
|
|
{- Avoids recent git's interactive merge. -}
|
|
|
|
|
mergeNonInteractive :: Ref -> Repo -> IO Bool
|
2012-07-17 18:50:37 +00:00
|
|
|
mergeNonInteractive branch
|
2012-07-17 18:51:42 +00:00
|
|
|
| older "1.7.7.6" = runBool "merge" [Param $ show branch]
|
2012-07-17 18:50:37 +00:00
|
|
|
| otherwise = runBool "merge" [Param "--no-edit", Param $ show branch]
|
