sync: Avoid recent git's interactive merge.

2012-06-23 10:22:56 -04:00 · 2012-06-23 10:22:56 -04:00 · c79e3b67e9
commit c79e3b67e9
parent 3118eeb63f
3 changed files with 20 additions and 1 deletions
--- a/Git/Merge.hs
+++ b/Git/Merge.hs
@ -0,0 +1,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]