summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-07 19:18:16 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-07 19:18:16 -0400
commit7a8627fd97087379ea903f62d4dae1161e811ef5 (patch)
tree13ef1a24815a8f6bf31b1b1d60f8ee855435d200
parent24dd4b227569cd4d3d7ca7907a7335f9f752cd10 (diff)
adjust for earlier change that made sync be introduced earlier
-rw-r--r--doc/walkthrough/syncing.mdwn10
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/walkthrough/syncing.mdwn b/doc/walkthrough/syncing.mdwn
index 3c43e502c..0c8d52559 100644
--- a/doc/walkthrough/syncing.mdwn
+++ b/doc/walkthrough/syncing.mdwn
@@ -1,11 +1,9 @@
-Notice that in the [[previous example|getting_file_content]], you had to
-git fetch and merge from laptop first. This lets git-annex know what has
-changed in laptop, and so it knows about the files present there and can
+Notice that in the [[previous example|getting_file_content]], `git annex
+sync` was used. This lets git-annex know what has changed in the other
+repositories like the laptop, and so it knows about the files present there and can
get them.
-If you have a lot of repositories to keep in sync, manually fetching and
-merging from them can become tedious. To automate it there is a handy
-sync command, which also even commits your changes for you.
+Let's look at what the sync command does in more detail:
# cd /media/usb/annex
# git annex sync