summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-09-18 15:43:20 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-09-18 15:43:20 -0400
commitf0446fb2f83983bfcbe9e513ddb92520b6fad7af (patch)
tree2cb0e4be05091245b7fe3830d878bd3d69940247
parent70adc6588d4a6375b45783165b098b191cf8654e (diff)
clarify that sync only commits changes to files already added to the repo
-rw-r--r--doc/git-annex.mdwn3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 71f0c0beb..011b6d91f 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -148,7 +148,8 @@ subdirectories).
Or specify `--fast` to sync with the remotes with the
lowest annex-cost value.
- The sync process involves first committing all local changes,
+ The sync process involves first committing any local changes to files
+ that have previously been added to the repository,
then fetching and merging the `synced/master` and the `git-annex` branch
from the remote repositories, and finally pushing the changes back to
those branches on the remote repositories. You can use standard git