summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-30 17:54:09 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-30 17:54:09 -0400
commit9d85baa31425e04f0eb79e43c09c8d4e4a414c6b (patch)
tree256b2cdc853714eec6d6f5ee22127b1e32361432 /Command
parent4400f65967c2b610f03725c1c5e2864c93a0978f (diff)
improve wording
Diffstat (limited to 'Command')
-rw-r--r--Command/Sync.hs16
1 files changed, 8 insertions, 8 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index 458a114df..790bf53b5 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -31,14 +31,14 @@ seek args = do
!branch <- currentBranch
let syncbranch = Git.Ref.under "refs/heads/synced/" branch
remotes <- syncRemotes syncbranch args
- return $
- [ commit
- , mergeLocal branch
- ] ++
- [ update remote branch | remote <- remotes ] ++
- [ mergeAnnex ] ++
- [ pushLocal syncbranch ] ++
- [ pushRemote remote branch syncbranch | remote <- remotes ]
+ return $ concat $
+ [ [ commit ]
+ , [ mergeLocal branch ]
+ , [ update remote branch | remote <- remotes ]
+ , [ mergeAnnex ]
+ , [ pushLocal syncbranch ]
+ , [ pushRemote remote branch syncbranch | remote <- remotes ]
+ ]
syncRemotes :: Git.Ref -> [String] -> Annex [Remote.Remote Annex]
syncRemotes branch [] = defaultSyncRemotes branch