sync: Avoid recent git's interactive merge.

1 files changed, 17 insertions, 0 deletions

diff --git a/Git/Merge.hs b/Git/Merge.hs
new file mode 100644
index 000000000..08fc6fb48
--- /dev/null
+++ 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]