diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-09 18:54:49 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-09 18:54:49 -0400 |
| commit | 90dd245522ccffee0e77eba3b79e32d6029977fc (patch) | |
| tree | 88f243d03da2a8906b6ac30bbb688f67d5646d3e /doc | |
| parent | 2136534be156c78273f949c34a9f54cdb37b7560 (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')
| -rw-r--r-- | doc/bugs/fsck_output.mdwn | 2 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 2 | ||||
| -rw-r--r-- | doc/walkthrough/getting_file_content.mdwn | 4 | ||||
| -rw-r--r-- | doc/walkthrough/transferring_files:_When_things_go_wrong.mdwn | 2 | ||||
| -rw-r--r-- | doc/walkthrough/using_ssh_remotes.mdwn | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/doc/bugs/fsck_output.mdwn b/doc/bugs/fsck_output.mdwn index 3ded1b409..90af1600d 100644 --- a/doc/bugs/fsck_output.mdwn +++ b/doc/bugs/fsck_output.mdwn @@ -30,7 +30,7 @@ The newline is in the wrong place and confuses the user. It should be printed _a > A related problem occurs if an error message is unexpetedly printed. > Dummying up an example: > -> O get test1 (copying from foo...) E git-annex: failed to run ssh +> O get test1 (from foo...) E git-annex: failed to run ssh > failed > > --[[Joey]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index b15ce1a29..25f053af6 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -41,7 +41,7 @@ content from the key-value store. # sudo mount /media/usb # git remote add usbdrive /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" # git annex add iso 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 |