remove: fix --force option help description (issue5177)

Before this commit --force option help description stated
that file was removed and deleted even if file was added
or modified which is not true. Force option removes added
file only from dirstate, it doesn't delete it from the
filesystem.
This commit is contained in:
liscju 2016-04-13 09:56:51 +02:00
parent 7d4b1c457a
commit 22e1e3529b
2 changed files with 2 additions and 2 deletions

View File

@ -5968,7 +5968,7 @@ def recover(ui, repo):
@command('^remove|rm',
[('A', 'after', None, _('record delete for missing files')),
('f', 'force', None,
_('remove (and delete) file even if added or modified')),
_('forget added files, delete modified files')),
] + subrepoopts + walkopts,
_('[OPTION]... FILE...'),
inferrepo=True)

View File

@ -2551,7 +2551,7 @@ Dish up an empty repo; serve it cold.
<td>record delete for missing files</td></tr>
<tr><td>-f</td>
<td>--force</td>
<td>remove (and delete) file even if added or modified</td></tr>
<td>forget added files, delete modified files</td></tr>
<tr><td>-S</td>
<td>--subrepos</td>
<td>recurse into subrepositories</td></tr>