diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-30 17:54:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-30 17:54:09 -0400 |
| commit | 9d85baa31425e04f0eb79e43c09c8d4e4a414c6b (patch) | |
| tree | 256b2cdc853714eec6d6f5ee22127b1e32361432 | |
| parent | 4400f65967c2b610f03725c1c5e2864c93a0978f (diff) | |
improve wording
| -rw-r--r-- | Command/Sync.hs | 16 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 6 |
2 files changed, 12 insertions, 10 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 diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 320453f18..3ca2ce177 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -126,7 +126,8 @@ subdirectories). one or more other repositories. The sync process involves first committing all local changes, then fetching and merging the `synced/master` and the `git-annex` branch from the remote repositories and finally pushing the - changes back to these remote branches. + changes back to these remote repositories. + You can use standard git commands to do each of those steps by hand, or if you don't want to worry about the details, you can use sync. @@ -134,7 +135,8 @@ subdirectories). `synced/master` branch. If you want to include/exclude a repository from this list, just create or delete this branch. - Note that sync does not transfer any file contents from or to the remote. + Note that sync does not transfer any file contents from or to the remote + repositories. * addurl [url ...] |