summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:58:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:58:39 -0400
commit3b1c80d7950216ea90f706d975ff663cb92e52c5 (patch)
tree168fad1884748df9dd0d36b965cc0d829028fb31 /doc
parent6fcf76bcd162a31b7099bc6ae624b11015ea52b4 (diff)
fix
Diffstat (limited to 'doc')
-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 fac6aa2a7..cdb4a72e0 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
+ # 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