summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn22
1 files changed, 15 insertions, 7 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 8264c31b3..83bfc7e40 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -76,12 +76,19 @@ Many git-annex commands will stage changes for later `git commit` by you.
will involve copying them from another repository, or downloading them,
or transferring them from some kind of key-value store.
+ When the --auto switch is used, only gets content of files if needed
+ to satisfy the setting of annex.numcopies
+
* drop [path ...]
Drops the content of annexed files from this repository.
- git-annex may refuse to drop content if it does not think
- it is safe to do so, typically because of the setting of annex.numcopies.
+ git-annex will refuse to drop content if it cannot verify it is
+ safe to do so. At least one copy of content needs to exist in another
+ remote. This can be overridden with the --force switch.
+
+ When the --auto switch is used, only tries to drop content if
+ more than annex.numcopies copies exist.
* move [path ...]
@@ -157,11 +164,6 @@ Many git-annex commands will stage changes for later `git commit` by you.
To avoid expensive checksum calculations, specify --fast
-* optimize [path ...]
-
- Either gets or drops file content, as needed, to work toward meeting the
- configured numcopies setting.
-
* unused
Checks the annex for data that does not correspond to any files present
@@ -340,6 +342,12 @@ Many git-annex commands will stage changes for later `git commit` by you.
Enables less expensive, but also less thorough versions of some commands.
What is avoided depends on the command.
+* --auto
+
+ Enable automatic mode, in which git-annex decides whether to perform
+ actions on files. See descriptions of individual commands to see what
+ they do in automatic mode.
+
* --quiet
Avoid the default verbose display of what is done; only show errors