diff options
author | 2013-07-03 15:42:56 -0400 | |
---|---|---|
committer | 2013-07-03 15:42:56 -0400 | |
commit | ac3d31034a0a2181e21d3ad599450322ed6a55dd (patch) | |
tree | 7135de5cab66606444ab0ea2504e9ef53fbc651f /doc | |
parent | fa45610f3809b7c0f1a469547d0c7e4209c05a9d (diff) |
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.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/git-annex.mdwn | 16 | ||||
-rw-r--r-- | doc/tips/setup_a_public_repository_on_a_web_site.mdwn | 7 |
2 files changed, 14 insertions, 9 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 0dc6fe7ae..5c364bd57 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -148,6 +148,15 @@ subdirectories). Note that sync does not transfer any file contents from or to the remote repositories. +* merge + + This performs the same merging that is done by the sync command, but + without pushing or pulling any data. + + One way to use this is to put `git annex merge` into a repository's + post-receive hook. Then any syncs to the repository will update its working + copy automatically. + * addurl [url ...] Downloads each url to its own file, which is added to the annex. @@ -401,13 +410,6 @@ subdirectories). as listed by the last `git annex unused`. The files will have names starting with "unused." -* merge - - Automatically merges remote tracking branches */git-annex into - the git-annex branch. While git-annex mostly handles keeping the - git-annex branch merged automatically, if you find you are unable - to push the git-annex branch due non-fast-forward, this will fix it. - * fix [path ...] Fixes up symlinks that have become broken to again point to annexed content. 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! |