aboutsummaryrefslogtreecommitdiff
path: root/doc/workflow.mdwn
diff options
context:
space:
mode:
authorGravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d6730 <0xloem@web>2016-12-15 21:18:00 +0000
committerGravatar admin <admin@branchable.com>2016-12-15 21:18:00 +0000
commit9e0c830bf7c60bb176726402a53197ebbd5143bb (patch)
treebfa944d481da33dd685af57e7d79c6c53bf19574 /doc/workflow.mdwn
parent76901d681648cc27015fb95d1f34aba5754169b1 (diff)
Link adjustments
Diffstat (limited to 'doc/workflow.mdwn')
-rw-r--r--doc/workflow.mdwn6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/workflow.mdwn b/doc/workflow.mdwn
index 225260873..ad11ec137 100644
--- a/doc/workflow.mdwn
+++ b/doc/workflow.mdwn
@@ -5,13 +5,13 @@ I will proceed to summarize all of these. I will begin at the automatic end, hop
Note that for each of these levels of interaction, all the levels following will also work as well. So you can actually manually move annexed files around while the webapp is running, etc.
# 1. [[git annex webapp|git-annex-webapp]]
-This command launches a local web server which serves a graphical user interface and automatically manages git annex. It will attempt to guide you through the whole process and do everything for you. I think the intent is that no other commands are needed. This should be run on every machine that may produce file changes.
+The [[`git annex webapp`|git-annex-webapp]] command launches a local web server which serves a graphical user interface and automatically manages git annex. It will attempt to guide you through the whole process and do everything for you. I think the intent is that no other commands are needed. This should be run on every machine that may produce file changes.
# 2. [[git annex assistant|git-annex-assistant]] without the webapp
-You could call this the command-line version of the webapp, giving you more control over creating and connecting your repositories, and configuring how files are moved between them. The assistant, when running, will automatically watch for file changes and synchronize them to other repositories, but you must manually create the repositories and configure the rules for syncing. To create a repository, use `git init` and then [[`git annex init`|git-annex-init]], and then `git remote add` it to any other repositories. If you want more than one annex, you can add their paths to `~/.config/git-annex/autostart` if you would like them to automatically begin syncing when `git annex assistant --autostart` is run, perhaps on boot or login. You can configure rules for where files are copied using the repository setup commands such as [[git annex preferred-content|git-annex-preferred-content]] to configure [[content preferences|preferred content]] for what goes where, [[`git annex numcopies`|git-annex-numcopies]] for how many [[copies]] must be kept of each file, and [[`git config annex.largefiles`|tips/largefiles]] to define small files that should be stored straight in git; most of the settings are accessible in one place with [[`git annex vicfg`|git-annex-vicfg]].
+You could call [[`git annex assistant`|git-annex-assistant]] the command-line version of the webapp, giving you more control over creating and connecting your repositories, and configuring how files are moved between them. The assistant, when running, will automatically watch for file changes and synchronize them to other repositories, but you must manually create the repositories and configure the rules for syncing. To create a repository, use `git init` and then [[`git annex init`|git-annex-init]], and then `git remote add` it to any other repositories. If you want more than one annex, you can add their paths to `~/.config/git-annex/autostart` if you would like them to automatically begin syncing when `git annex assistant --autostart` is run, perhaps on boot or login. You can configure rules for where files are copied using the repository setup commands such as [[git annex preferred-content|git-annex-preferred-content]] to configure [[content preferences|preferred content]] for what goes where, [[`git annex numcopies`|git-annex-numcopies]] for how many [[copies]] must be kept of each file, and [[`git config annex.largefiles`|tips/largefiles]] to define small files that should be stored straight in git; most of the settings are accessible in one place with [[`git annex vicfg`|git-annex-vicfg]].
# 3. [[git annex watch|git-annex-watch]] without the assistant
-This command is like the assistant but has no automatic network behavior, giving you complete control over when repositories are pushed and pulled, and when files are moved between systems. The local repository is watched, and any file changes are added to git-annex. In order to synchronize between repositories, you must run [[`git annex sync `|git-annex-sync]]` --content` in the repository with the changes, which will merge the git history and logs with your remotes, and automatically transfer files to match your preferred and required content expressions.
+The [[`git annex watch`|git-annex-watch]] command is like the assistant but has no automatic network behavior, giving you complete control over when repositories are pushed and pulled, and when files are moved between systems. The local repository is watched, and any file changes are added to git-annex. In order to synchronize between repositories, you must run [[`git annex sync --content`|git-annex-sync]] in the repository with the changes, which will merge the git history and logs with your remotes, and automatically transfer files to match your preferred and required content expressions.
# 4. No background processes
This allows you to decide when and what files are annexed. In order to tell git-annex to manage files, you must [[`git annex add`|git-annex-add]] the files.