aboutsummaryrefslogtreecommitdiff
path: root/doc/git-annex-shell.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-08-05 13:49:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-08-05 13:49:58 -0400
commita43686b9847c19efebd1f15519083436ac155a8e (patch)
tree98abed3386788da3002142a1053cdce09789c023 /doc/git-annex-shell.mdwn
parent0ad42412dbc981969e0847b498701e6b9ca6dd17 (diff)
Simplify setup process for a ssh remote.
Now it suffices to run git remote add, followed by git-annex sync. Now the remote is automatically initialized for use by git-annex, where before the git-annex branch had to manually be pushed before using git-annex sync. Note that this involved changes to git-annex-shell, so if the remote is using an old version, the manual push is still needed. Implementation required git-annex-shell be changed, so configlist can autoinit a repository even when no git-annex branch has been pushed yet. Unfortunate because we'll have to wait for it to get deployed to servers before being able to rely on this change in the documentation. Did consider making git-annex sync push the git-annex branch to repos that didn't have a uuid, but this seemed difficult to do without complicating it in messy ways. It would be cleaner to split a command out from configlist to handle the initialization. But this is difficult without sacrificing backwards compatability, for users of old git-annex versions which would not use the new command.
Diffstat (limited to 'doc/git-annex-shell.mdwn')
-rw-r--r--doc/git-annex-shell.mdwn5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/git-annex-shell.mdwn b/doc/git-annex-shell.mdwn
index 1a7e85570..d0e0930c5 100644
--- a/doc/git-annex-shell.mdwn
+++ b/doc/git-annex-shell.mdwn
@@ -31,7 +31,8 @@ first "/~/" or "/~user/" is expanded to the specified home directory.
When run in a repository that does not yet have an annex.uuid, one
will be created, as long as a git-annex branch has already been pushed to
- the repository.
+ the repository, or if the autoinit= flag is used to indicate
+ initialization is desired.
* inannex directory [key ...]
@@ -95,7 +96,7 @@ to git-annex-shell are:
on new dashed options).
Currently used fields include remoteuuid=, associatedfile=,
- and direct=
+ direct=, and autoinit=
# HOOK