summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 14:52:05 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-06-09 14:52:05 -0400
commit47c2ad33d08bb828cd63544bc4c9cb1d294fc090 (patch)
tree2d04fc77302c1ab9f89fa55884e649876d685b8d /doc
parentf80592f1603fdfdde4b092e9880646ded505163a (diff)
dead --key: Can be used to mark a key as dead.
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex-dead.mdwn21
-rw-r--r--doc/git-annex.mdwn12
2 files changed, 22 insertions, 11 deletions
diff --git a/doc/git-annex-dead.mdwn b/doc/git-annex-dead.mdwn
index 680d8bba2..804bb419a 100644
--- a/doc/git-annex-dead.mdwn
+++ b/doc/git-annex-dead.mdwn
@@ -1,18 +1,25 @@
# NAME
-git-annex trust - hide a lost repository
+git-annex dead - hide a lost repository or key
# SYNOPSIS
-git annex dead `[repository ...]`
+git annex dead `[repository ...] [--key key]`
# DESCRIPTION
-Indicates that the repository has been irretrievably lost.
-(To undo, use semitrust.)
+This command exists to deal with situations where data has been lost,
+and you know it has, and you want to stop being reminded of that fact.
+When a repository is specified, indicates that the repository has
+been irretrievably lost, so it will not be listed in eg, `git annex info`.
Repositories can be specified using their remote name, their
-description, or their UUID.
+description, or their UUID. (To undo, use `git-annex semitrust`.)
+
+When a key is specified, indicates that the content of that key has been
+irretrievably lost. This prevents `git annex fsck --all` from complaining
+about it. (To undo, add the key's content back to the repository,
+by using eg, `git-annex reinject`.)
# SEE ALSO
@@ -26,6 +33,10 @@ description, or their UUID.
[[git-annex-expire]](1)
+[[git-annex-fsck]](1)
+
+[[git-annex-reinject]](1)
+
# AUTHOR
Joey Hess <id@joeyh.name>
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 64f70f792..e7c80f3cd 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -238,12 +238,6 @@ subdirectories).
See [[git-annex-semitrust]](1) for details.
-* `dead [repository ...]`
-
- Indicates that the repository has been irretrievably lost.
-
- See [[git-annex-dead]](1) for details.
-
* `group repository groupname`
Add a repository to a group.
@@ -356,6 +350,12 @@ subdirectories).
See [[git-annex-upgrade]](1) for details.
+* `dead [repository ...] [--key key]`
+
+ Indicates that a repository or a single key has been irretrievably lost.
+
+ See [[git-annex-dead]](1) for details.
+
* `forget`
Causes the git-annex branch to be rewritten, throwing away historical