summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-25 19:39:44 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-25 19:50:44 -0400
commit62a2644d670e61ac8f6d6d24c49c640d00ba097d (patch)
tree9972252146482821da75761bd4222539d271d37d /doc
parent4d7d3fde4d7594d34a6951ce6c5a24ca11111739 (diff)
dropunused behavior change: Now refuses to drop the last copy of a file, unless you use the --force.
This was the last place in git-annex that could remove data referred to by the git history, without being forced. Like drop, dropunused checks remotes, and honors the global annex.numcopies setting. (However, .gitattributes settings cannot apply to unused files.)
Diffstat (limited to 'doc')
-rw-r--r--doc/direct_mode.mdwn2
-rw-r--r--doc/walkthrough/unused_data.mdwn2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/direct_mode.mdwn b/doc/direct_mode.mdwn
index ee38b66d2..b0e9a0adb 100644
--- a/doc/direct_mode.mdwn
+++ b/doc/direct_mode.mdwn
@@ -35,7 +35,7 @@ To stop using direct mode:
With direct mode, you're operating without large swathes of git-annex's
carefully constructed safety net, which ensures that past versions of
-files are preserved and can be accessed (until you dropunused them).
+files are preserved and can be accessed.
With direct mode, any file can be edited directly, or deleted at any time,
and there's no guarantee that the old version is backed up somewhere else.
diff --git a/doc/walkthrough/unused_data.mdwn b/doc/walkthrough/unused_data.mdwn
index 7e910b5f5..1d655b89a 100644
--- a/doc/walkthrough/unused_data.mdwn
+++ b/doc/walkthrough/unused_data.mdwn
@@ -19,7 +19,7 @@ preserving it. So from time to time, you may want to check for such data:
After running `git annex unused`, you can follow the instructions to examine
the history of files that used the data, and if you decide you don't need that
-data anymore, you can easily remove it:
+data anymore, you can easily remove it from your local repository.
# git annex dropunused 1
dropunused 1 ok