summaryrefslogtreecommitdiff
path: root/doc/walkthrough
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:55:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:55:11 -0400
commita0227e81f9c82afc12ac1bd1cecd63cc0894d751 (patch)
tree6f0886c7ac754129e55d8aac4a0390f8526b72bd /doc/walkthrough
parent304930f1fc952b8f2dbe019049d5e02d8eb582dc (diff)
put in explicit fetch ; merge in walkthrough for now
and link to centralized repository tutorial
Diffstat (limited to 'doc/walkthrough')
-rw-r--r--doc/walkthrough/getting_file_content.mdwn18
1 files changed, 11 insertions, 7 deletions
diff --git a/doc/walkthrough/getting_file_content.mdwn b/doc/walkthrough/getting_file_content.mdwn
index 71f95f79e..5ad97bc32 100644
--- a/doc/walkthrough/getting_file_content.mdwn
+++ b/doc/walkthrough/getting_file_content.mdwn
@@ -6,14 +6,18 @@ We can use this to copy everything in the laptop's annex to the
USB drive.
# cd /media/usb/annex
- # git pull laptop
+ # git fetch laptop
+ # git merge laptop/master
# git annex get .
get my_cool_big_file (from laptop...) ok
get iso/debian.iso (from laptop...) ok
-Notice that you had to git pull from laptop first, this lets git-annex know
-what has changed in laptop, and so it knows about the files present there and
-can get them. The alternate approach is to set up a central bare repository,
-and always push changes to it after committing them, then in the above,
-you can just pull from the central repository to get synced up to all
-repositories.
+Notice that 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 get them.
+
+The alternate approach is to set up a
+[[central bare repository|tips/centralized_git_repository_tutorial]], and
+always push changes to it after committing them, then in the above,
+you can just pull from the central repository to get synced up to
+all repositories.