aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-07-11 14:08:40 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-07-11 14:08:40 -0400
commit72be52f19d838bb6efb428f39897b2924e40d712 (patch)
tree4b93ede03a7940582b694a00e30cc540aecf3ee9
parent532a97119d425b08589bab5ca9c70fa664bfe97f (diff)
improve documentation about sync
-rw-r--r--doc/bugs/git-annex_sync_does_not_push.mdwn2
-rw-r--r--doc/git-annex.mdwn5
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/bugs/git-annex_sync_does_not_push.mdwn b/doc/bugs/git-annex_sync_does_not_push.mdwn
index 3f17664f2..a5fbc1742 100644
--- a/doc/bugs/git-annex_sync_does_not_push.mdwn
+++ b/doc/bugs/git-annex_sync_does_not_push.mdwn
@@ -48,3 +48,5 @@ The following script (from <https://gist.github.com/gioele/d4e0905a3570f097fb0b>
### What version of git-annex are you using? On what operating system?
5.20140412ubuntu1 from Ubuntu 14.04.
+
+> Documentation fixed, so provisionally [[done]] --[[Joey]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index a6b2cbb83..dc3249456 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -140,8 +140,9 @@ subdirectories).
Use this command when you want to synchronize the local repository with
one or more of its remotes. You can specify the remotes to sync with;
- the default is to sync with all remotes. Or specify `--fast` to sync with
- the remotes with the lowest annex-cost value.
+ the default is to sync with all remotes that have an annex.uuid
+ configured. Or specify `--fast` to sync with the remotes with the
+ lowest annex-cost value. Or specify the remotes to sync with.
The sync process involves first committing all local changes,
then fetching and merging the `synced/master` and the `git-annex` branch