File: Merge.hs

package info (click to toggle)
git-annex 3.20120629
  • links: PTS
  • area: main
  • in suites: wheezy
  • size: 6,000 kB
  • sloc: haskell: 12,228; makefile: 93; ansic: 84; perl: 37; sh: 10
file content (17 lines) | stat: -rw-r--r-- 371 bytes parent folder | download 
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]