From dc27de1f2b8a2ae13db947f99435b38c5fa01f3a Mon Sep 17 00:00:00 2001 From: Antoine Beaupré Date: Fri, 29 May 2015 12:02:22 -0400 Subject: explain in the required manpage the difference with wanted --- doc/git-annex-required.mdwn | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/doc/git-annex-required.mdwn b/doc/git-annex-required.mdwn index cde3cd6ab..8239ac7d5 100644 --- a/doc/git-annex-required.mdwn +++ b/doc/git-annex-required.mdwn @@ -9,7 +9,7 @@ git annex required `repository [expression]` # DESCRIPTION When run with an expression, configures the content that is required -to be held in the archive. See [[git-annex-preferred-content]](1) +to be held in the archive. For example: @@ -18,10 +18,20 @@ For example: Without an expression, displays the current required content setting of the repository. +While [[git-annex-wanted]] is just a preference, +[[git-annex-required]] designates content that should really not be +removed. For example a file that is `wanted` can be removed with `git +annex drop`, but if that file is `required`, it would need to be +removed with `git annex drop --force`. + # SEE ALSO [[git-annex]](1) +[[git-annex-wanted]](1) + +[[git-annex-preferred-content]](1) + # AUTHOR Joey Hess -- cgit v1.2.3