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
Show stats 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 !branch <- currentBranch
let syncbranch = Git.Ref.under "refs/heads/synced/" branch let syncbranch = Git.Ref.under "refs/heads/synced/" branch
remotes <- syncRemotes syncbranch args remotes <- syncRemotes syncbranch args
return $ return $ concat $
[ commit [ [ commit ]
, mergeLocal branch , [ mergeLocal branch ]
] ++ , [ update remote branch | remote <- remotes ]
[ update remote branch | remote <- remotes ] ++ , [ mergeAnnex ]
[ mergeAnnex ] ++ , [ pushLocal syncbranch ]
[ pushLocal syncbranch ] ++ , [ pushRemote remote branch syncbranch | remote <- remotes ]
[ pushRemote remote branch syncbranch | remote <- remotes ] ]
syncRemotes :: Git.Ref -> [String] -> Annex [Remote.Remote Annex] syncRemotes :: Git.Ref -> [String] -> Annex [Remote.Remote Annex]
syncRemotes branch [] = defaultSyncRemotes branch syncRemotes branch [] = defaultSyncRemotes branch

6
doc/git-annex.mdwn
View file

@ -126,7 +126,8 @@ subdirectories).
one or more other repositories. The sync process involves first committing one or more other repositories. The sync process involves first committing
all local changes, then fetching and merging the `synced/master` and the all local changes, then fetching and merging the `synced/master` and the
`git-annex` branch from the remote repositories and finally pushing 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, 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. 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 `synced/master` branch. If you want to include/exclude a repository from
this list, just create or delete this branch. 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 ...] * addurl [url ...]