merge: Now also merges synced/master or similar branches, which makes it useful to put in a post-receive hook to make a repository automatically update its working copy when git annex sync or the assistant sync with it.

1 files changed, 5 insertions, 2 deletions

diff --git a/doc/tips/setup_a_public_repository_on_a_web_site.mdwn b/doc/tips/setup_a_public_repository_on_a_web_site.mdwn
index dae1d69c2..e1fbd1e47 100644
--- a/doc/tips/setup_a_public_repository_on_a_web_site.mdwn
+++ b/doc/tips/setup_a_public_repository_on_a_web_site.mdwn
@@ -20,9 +20,12 @@ Here's how I set it up. --[[Joey]]
 7. Instruct advanced users to clone a http url that ends with the "/.git/"
    directory. For example, for downloads.kitenet.net, the clone url
    is `https://downloads.kitenet.net/.git/`
+8. Set up a git `post-receive` hook that runs `git annex merge`, and
+   the repository's working tree will automatically be updated when
+   you run `git annex sync` in a clone that can push to the repository.  
+   (Needs git-annex version 4.20130703 or newer; older versions
+   can use `git annex sync` in the post-receive hook instead.)
 
 When users clone over http, and run git-annex, it will
 automatically learn all about your repository and be able to download files
 right out of it, also using http. 
-
-Enjoy!