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

improve docs, mention git config receive.denyCurrentBranch updateInstead

Browse source
This commit is contained in:
Joey Hess 2017-05-25 13:43:20 -04:00
parent c204654fe5
commit 4c2e701f0b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/git-annex-sync.mdwn
View file

@ -26,8 +26,9 @@ versions of a file have been committed, both will be added to the tree,
under different filenames. For example, file "foo" would be replaced under different filenames. For example, file "foo" would be replaced
with "foo.somekey" and "foo.otherkey". with "foo.somekey" and "foo.otherkey".
Note that syncing with a remote will not update the remote's working Note that syncing with a remote will not normally update the remote's working
tree with changes made to the local repository. However, those changes tree with changes made to the local repository. (Unless it's configured
with receive.denyCurrentBranch=updateInstead.) However, those changes
are pushed to the remote, so they can be merged into its working tree are pushed to the remote, so they can be merged into its working tree
by running "git annex sync" on the remote. by running "git annex sync" on the remote.