Searched refs:mergeLocal (Results 1 – 3 of 3) sorted by relevance
| /dports/devel/hs-git-annex/git-annex-8.20210903/Command/ |
| H A D | PostReceive.hs | 17 import Command.Sync (mergeLocal, prepMerge, mergeConfig, SyncOptions(..))
56 mergeLocal mc o =<< getCurrentBranch
|
| H A D | Merge.hs | 15 import Command.Sync (prepMerge, mergeLocal, mergeConfig, merge, notOnlyAnnexOption, parseUnrelatedH…
57 mergeLocal mc def =<< getCurrentBranch
|
| H A D | Sync.hs | 18 mergeLocal,
240 , [ withbranch (mergeLocal mc o) ]
381 mergeLocal :: [Git.Merge.MergeConfig] -> SyncOptions -> CurrBranch -> CommandStart
382 mergeLocal mergeconfig o currbranch = stopUnless (notOnlyAnnex o) $ function
|