summaryrefslogtreecommitdiff
path: root/doc/walkthrough
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-09 18:54:49 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-09 18:54:49 -0400
commit90dd245522ccffee0e77eba3b79e32d6029977fc (patch)
tree88f243d03da2a8906b6ac30bbb688f67d5646d3e /doc/walkthrough
parent2136534be156c78273f949c34a9f54cdb37b7560 (diff)
get --from is the same as copy --from
get not honoring --from has surprised me a few times, so least surprise suggests it should just behave like copy --from. This leaves the difference between get and copy being that copy always requires the remote to copy from, while get will decide whether to get a file from a key/value store or a remote.
Diffstat (limited to 'doc/walkthrough')
-rw-r--r--doc/walkthrough/getting_file_content.mdwn4
-rw-r--r--doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn2
-rw-r--r--doc/walkthrough/using_ssh_remotes.mdwn2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/walkthrough/getting_file_content.mdwn b/doc/walkthrough/getting_file_content.mdwn
index 5c899ee3c..bf45fd97f 100644
--- a/doc/walkthrough/getting_file_content.mdwn
+++ b/doc/walkthrough/getting_file_content.mdwn
@@ -8,8 +8,8 @@ USB drive.
# cd /media/usb/annex
# git pull laptop master
# git annex get .
- get my_cool_big_file (copying from laptop...) ok
- get iso/debian.iso (copying from laptop...) ok
+ 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
diff --git a/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn b/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn
index d8f0a19bd..936d088f1 100644
--- a/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn
+++ b/doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn
@@ -14,5 +14,5 @@ it:
failed
# sudo mount /media/usb
# git annex get video/hackity_hack_and_kaxxt.mov
- get video/hackity_hack_and_kaxxt.mov (copying from usbdrive...) ok
+ get video/hackity_hack_and_kaxxt.mov (from usbdrive...) ok
# git commit -a -m "got a video I want to rewatch on the plane"
diff --git a/doc/walkthrough/using_ssh_remotes.mdwn b/doc/walkthrough/using_ssh_remotes.mdwn
index 4c2f830de..fbbbbe070 100644
--- a/doc/walkthrough/using_ssh_remotes.mdwn
+++ b/doc/walkthrough/using_ssh_remotes.mdwn
@@ -12,7 +12,7 @@ to clone the laptop's annex to it:
Now you can get files and they will be transferred (using `rsync` via `ssh`):
# git annex get my_cool_big_file
- get my_cool_big_file (getting UUID for origin...) (copying from origin...)
+ get my_cool_big_file (getting UUID for origin...) (from origin...)
WORM-s2159-m1285650548--my_cool_big_file 100% 2159 2.1KB/s 00:00
ok