mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

noninteractive merge

Browse source
This commit is contained in:
Joey Hess 2012-06-23 10:29:46 -04:00
parent d88ee75a2d
commit 19eee6a1df
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Assistant/Merger.hs
View file

@ -12,7 +12,7 @@ import Assistant.ThreadedMonad
import Utility.DirWatcher import Utility.DirWatcher
import Utility.Types.DirWatcher import Utility.Types.DirWatcher
import qualified Git import qualified Git
import qualified Git.Command import qualified Git.Merge
import qualified Git.Branch import qualified Git.Branch
import qualified Command.Sync import qualified Command.Sync
@ -69,5 +69,4 @@ onAdd g file _
void $ mergeBranch branch g void $ mergeBranch branch g
mergeBranch :: Git.Ref -> Git.Repo -> IO Bool mergeBranch :: Git.Ref -> Git.Repo -> IO Bool
mergeBranch branch = Git.Command.runBool "merge" mergeBranch = Git.Merge.mergeNonInteractive . Command.Sync.syncBranch
[Param $ show $ Command.Sync.syncBranch branch]