##// END OF EJS Templates
help: improve description of update --check
Kevin Bullock -
r12688:8c034a82 default
parent child Browse files
Show More
@@ -3745,12 +3745,15 b' def update(ui, repo, node=None, rev=None'
3745 3745 """update working directory (or switch revisions)
3746 3746
3747 3747 Update the repository's working directory to the specified
3748 changeset. If no changeset is specified, update to the tip of the
3749 current named branch.
3750
3751 If the changeset is not a descendant of the working directory's
3752 parent, the update is aborted. With the -c/--check option, the
3753 working directory is checked for uncommitted changes; if none are
3754 found, the working directory is updated to the specified
3748 3755 changeset.
3749 3756
3750 If no changeset is specified, attempt to update to the tip of the
3751 current branch. If this changeset is a descendant of the working
3752 directory's parent, update to it, otherwise abort.
3753
3754 3757 The following rules apply when the working directory contains
3755 3758 uncommitted changes:
3756 3759
@@ -3772,7 +3775,8 b' def update(ui, repo, node=None, rev=None'
3772 3775 Use null as the changeset to remove the working directory (like
3773 3776 :hg:`clone -U`).
3774 3777
3775 If you want to update just one file to an older changeset, use :hg:`revert`.
3778 If you want to update just one file to an older changeset, use
3779 :hg:`revert`.
3776 3780
3777 3781 See :hg:`help dates` for a list of formats valid for -d/--date.
3778 3782
@@ -4428,7 +4432,8 b' table = {'
4428 4432 "^update|up|checkout|co":
4429 4433 (update,
4430 4434 [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
4431 ('c', 'check', None, _('check for uncommitted changes')),
4435 ('c', 'check', None,
4436 _('update across branches if no uncommitted changes')),
4432 4437 ('d', 'date', '',
4433 4438 _('tipmost revision matching date'), _('DATE')),
4434 4439 ('r', 'rev', '',
General Comments 0
You need to be logged in to leave comments. Login now