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

improve wording

Browse source
This commit is contained in:
Joey Hess 2011-12-30 17:54:09 -04:00
parent 4400f65967
commit 9d85baa314
2 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Command/Sync.hs
View file

@ -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