improve wording
This commit is contained in:
parent
4400f65967
commit
9d85baa314
2 changed files with 12 additions and 10 deletions
|
@ -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
|
||||
|
|
|
@ -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 ...]
|
||||
|
||||
|
|
Loading…
Reference in a new issue