summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-01-02 14:20:51 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-01-02 14:20:51 -0400
commitae99b64b538f13e2100429afd8b4de7960db8cff (patch)
treefe4ac376809f634f666be421aba2835581e32000
parentaa0882691bb2aa64fb13f0df85be0469fd33d98d (diff)
mention this commits -a
-rw-r--r--doc/git-annex.mdwn4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index ee7137e13..896ccc311 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -127,8 +127,8 @@ subdirectories).
the default is to sync with all remotes. Or specify --fast to sync with
the remotes with the lowest annex-cost value.
- The sync process involves first committing all local changes, then
- fetching and merging the `synced/master` and the `git-annex` branch
+ The sync process involves first committing all local changes (git commit -a),
+ 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
commands to do each of those steps by hand, or if you don't want to