summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-08-23 13:55:18 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-08-23 13:55:18 -0400
commit47080b785195b73c180e023320b456d20737d777 (patch)
tree3e2e60459ad9a67956a65fb9b0bfef1ee3cbd3ea
parent54749926b80b2dc3f453433e3c34e51953bb2de9 (diff)
mention git annex sync since people seem to be confused about how to sync direct mode repositories
-rw-r--r--doc/direct_mode.mdwn10
1 files changed, 9 insertions, 1 deletions
diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn
index b0e9a0adb..a6a2003a7 100644
--- a/doc/direct_mode.mdwn
+++ b/doc/direct_mode.mdwn
@@ -56,7 +56,15 @@ A very few commands don't work in direct mode, and will refuse to do anything.
Direct mode also works well with the git-annex assistant.
-You can use `git commit --staged`, or plain `git commit`.
+The most important command to use in a direct mode repository is `git annex
+sync`. This will commit any files you have run `git annex add` on, as well
+as files that were added earlier and have been modified. It will push
+the changes to other repositories for `git annex sync` there to pick up,
+and will pull and merge any changes made on other repositories into the
+local repository.
+
+While you generally will just use `git annex sync`, if you want to,
+you can use `git commit --staged`, or plain `git commit`.
But not `git commit -a`, or `git commit <file>` ..
that'd commit whole large files into git!