diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 10:22:56 -0400 |
| commit | c79e3b67e9e55817992d2d0c72fd6f01a6a403ec (patch) | |
| tree | 3632838125b3e624ed2fb222f64bc0251dfee26e /Git | |
| parent | 3118eeb63fbd5ae6565c49c1e8d14f61b6f8f810 (diff) | |
sync: Avoid recent git's interactive merge.
Diffstat (limited to 'Git')
| -rw-r--r-- | Git/Merge.hs | 17 |
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] |