mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

put in explicit fetch ; merge in walkthrough for now

Browse source 
and link to centralized repository tutorial
This commit is contained in:
Joey Hess 2011-12-23 12:55:11 -04:00
parent 304930f1fc
commit a0227e81f9
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
doc/walkthrough/getting_file_content.mdwn
View file

@ -6,14 +6,18 @@ We can use this to copy everything in the laptop's annex to the
USB drive.
# cd /media/usb/annex
# git pull 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
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
can get them. The alternate approach is to set up a central bare repository,
and always push changes to it after committing them, then in the above,
you can just pull from the central repository to get synced up to all
repositories.
Notice that you had to git fetch and merge from laptop first, this lets
git-annex know what has changed in laptop, and so it knows about the files
present there and can get them.
The alternate approach is to set up a
[[central bare repository|tips/centralized_git_repository_tutorial]], and
always push changes to it after committing them, then in the above,
you can just pull from the central repository to get synced up to
all repositories.