summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/View.hs2
-rw-r--r--doc/git-annex.mdwn10
2 files changed, 6 insertions, 6 deletions
diff --git a/Command/View.hs b/Command/View.hs
index 9aad12558..155b6057d 100644
--- a/Command/View.hs
+++ b/Command/View.hs
@@ -34,7 +34,7 @@ start params = do
go view Nothing = next $ perform view
go view (Just v)
| v == view = stop
- | otherwise = error "Already in a view. Use 'git annex vadd' to further refine this view."
+ | otherwise = error "Already in a view. Use the vfilter and vadd commands to further refine this view."
perform :: View -> CommandPerform
perform view = do
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 59abfd37a..f0b29f336 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -729,15 +729,15 @@ subdirectories).
and checks out the view branch. Only files in the current branch whose
metadata matches all the specified field values and tags will be
shown in the view.
-
- Once within a view, you can make additional directories, and
- copy or move files into them. When you commit, the metadata will
- be updated to correspond to your changes.
Multiple values for a metadata field can be specified, either by using
a glob (`field="*"`) or by listing each wanted value. The resulting view
will put files in subdirectories according to the value of their fields.
+ Once within such a view, you can make additional directories, and
+ copy or move files into them. When you commit, the metadata will
+ be updated to correspond to your changes.
+
There are fields corresponding to the path to the file. So a file
"foo/bar/baz/file" has fields "/=foo", "foo/=bar", and "foo/bar/=baz".
These location fields can be used the same as other metadata to construct
@@ -759,7 +759,7 @@ subdirectories).
Filters the current view to only the files that have the
specified field values and tags.
-* `vadd [field=glob ...] [field=value ...]`
+* `vadd [field=glob ...] [field=value ...] [tag ...]`
Changes the current view, adding an additional level of directories
to categorize the files.