summaryrefslogtreecommitdiff
path: root/doc/walkthrough/getting_file_content.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-09-04 18:08:47 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-09-04 18:08:47 -0400
commit02b51c10f48e9205d2a18d58430143be6f3ae78e (patch)
treeb8dbdc4a79a300d8aa451a04831e238ead45e753 /doc/walkthrough/getting_file_content.mdwn
parentf77547a335232d85af462764ce90531815b1fea3 (diff)
parent5fb17c2c28288ae2a663d2ce5ec32ff627d608b5 (diff)
Merge branch 'master' into encryption
Diffstat (limited to 'doc/walkthrough/getting_file_content.mdwn')
-rw-r--r--doc/walkthrough/getting_file_content.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/walkthrough/getting_file_content.mdwn b/doc/walkthrough/getting_file_content.mdwn
index f41e17770..f92704ff3 100644
--- a/doc/walkthrough/getting_file_content.mdwn
+++ b/doc/walkthrough/getting_file_content.mdwn
@@ -6,7 +6,7 @@ We can use this to copy everything in the laptop's annex to the
USB drive.
# cd /media/usb/annex
- # git fetch laptop; git merge laptop/master
+ # git annex sync laptop
# git annex get .
get my_cool_big_file (from laptop...) ok
get iso/debian.iso (from laptop...) ok