summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--doc/git-annex.mdwn4
2 files changed, 2 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index e02188bd6..4f7a01a48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,8 @@ git-annex (4.20130628) UNRELEASED; urgency=low
* --all: New switch that makes git-annex operate on all data stored
in the git annex, including old versions of files. Supported by
- fsck, get, drop, move, copy, migrate.
- * get, drop, move, copy, migrate: Can now be run in a bare repository,
+ fsck, get, move, copy, migrate.
+ * get, move, copy, migrate: Can now be run in a bare repository,
like fsck already could. --all is enabled automatically in this case.
* webapp: Fix ssh setup with nonstandard port, broken in last release.
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index e3d6ef4dc..012b7595c 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -610,10 +610,6 @@ subdirectories).
normal behavior is to only operate on specified files in the working
tree.
- Note that using --all makes .gitattributes annex.numcopies settings
- not be honored. Other numcopies settings are still taken into account.
- --all cannot be combined with --auto.
-
* --quiet
Avoid the default verbose display of what is done; only show errors