summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:57:52 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-23 12:57:52 -0400
commit6fcf76bcd162a31b7099bc6ae624b11015ea52b4 (patch)
treed4f5e0c7f68269189dd1e6bbb125e8dd12ead581
parenta0227e81f9c82afc12ac1bd1cecd63cc0894d751 (diff)
slight simplification
-rw-r--r--doc/walkthrough/getting_file_content.mdwn3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/walkthrough/getting_file_content.mdwn b/doc/walkthrough/getting_file_content.mdwn
index 5ad97bc32..fac6aa2a7 100644
--- a/doc/walkthrough/getting_file_content.mdwn
+++ b/doc/walkthrough/getting_file_content.mdwn
@@ -6,8 +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 fetch laptop; git merge laptop
# git annex get .
get my_cool_big_file (from laptop...) ok
get iso/debian.iso (from laptop...) ok