summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-23 18:04:38 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-23 18:04:38 -0400
commitd75da353b9905bb5757df08520e63607fbfd2073 (patch)
tree5f1205e4254ad2a1ca815dcc5393cfa10e3d1c83 /doc
parent6dc23b889e01d56a7aff241f9b7e347dd55cfc47 (diff)
documentation/warning message update for future feature
Diffstat (limited to 'doc')
-rw-r--r--doc/git-annex.mdwn5
-rw-r--r--doc/special_remotes.mdwn6
2 files changed, 2 insertions, 9 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 59da9dd8c..714f23bef 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -182,12 +182,11 @@ subdirectories).
* unused
Checks the annex for data that does not correspond to any files present
- in the currently checked out branch, and prints a numbered list of the data.
+ in any tar or branch, and prints a numbered list of the data.
To only show unused temp and bad files, specify --fast
- To check data on a remote that does not correspond to any files present
- on the locally checked out branch, specify --from.
+ To check for annexed data on a remote, specify --from.
* dropunused [number ...]
diff --git a/doc/special_remotes.mdwn b/doc/special_remotes.mdwn
index 55cd1f1a0..ddb2fd125 100644
--- a/doc/special_remotes.mdwn
+++ b/doc/special_remotes.mdwn
@@ -29,11 +29,5 @@ on special remotes, instead use `git annex unused --from`. Example:
1 WORM-s3-m1301674316--foo
(To see where data was previously used, try: git log --stat -S'KEY')
(To remove unwanted data: git-annex dropunused --from mys3 NUMBER)
- Please be cautious -- are you sure that the remote repository
- does not use this data?
$ git annex dropunused --from mys3 1
dropunused 12948 (from mys3...) ok
-
-Do be cautious when using this; it cannot detect if content in a remote
-is used by that remote, or is the last copy of data that is used by
-some *other* remote.