summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn17
1 files changed, 14 insertions, 3 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index cf6a0c6bd..ffcfa1f3b 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -259,13 +259,13 @@ subdirectories).
To check a remote to fsck, specify --from.
+ To avoid expensive checksum calculations (and expensive transfers when
+ fscking a remote), specify --fast.
+
To start a new incremental fsck, specify --incremental. Then
the next time you fsck, you can specify --more to skip over
files that have already been checked, and continue where it left off.
- To avoid expensive checksum calculations (and expensive transfers when
- fscking a remote), specify --fast.
-
* unused
Checks the annex for data that does not correspond to any files present
@@ -514,6 +514,17 @@ subdirectories).
Overrides the `annex.numcopies` setting, forcing git-annex to ensure the
specified number of copies exist.
+* --time-limit=time
+
+ Limits how long a git-annex command runs. The time can be something
+ like "5h", or "30m" or even "45s" or "10d".
+
+ Note that git-annex may continue running a little past the specified
+ time limit, in order to finish processing a file.
+
+ Also, note that if the time limit prevents git-annex from doing all it
+ was asked to, it will exit with a special code, 101.
+
* --trust=repository
* --semitrust=repository
* --untrust=repository