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, 9 insertions, 7 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.