diff options
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index 75752f4ff..c2f0eebe7 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -434,7 +434,7 @@ mergeRemote remote currbranch mergeconfig resolvemergeoverride = ifM isBareRepo (mapM (merge currbranch mergeconfig resolvemergeoverride Git.Branch.ManualCommit . remoteBranch remote) =<< getlist) tomerge = filterM (changed remote) branchlist Nothing = [] - branchlist (Just branch) = [branch, syncBranch branch] + branchlist (Just branch) = [fromDirectBranch (fromAdjustedBranch branch), syncBranch branch] pushRemote :: SyncOptions -> Remote -> CurrBranch -> CommandStart pushRemote _o _remote (Nothing, _) = stop |