Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 17144:71e36b3d2cc4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: mention how update can be used to cancel an uncommitted merge
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 10 Jul 2012 21:26:18 +0200
parents c9e6c6ae4ea1
children f7152a0d90df dd09bbd48646
comparison
equal deleted inserted replaced
17143:c9e6c6ae4ea1 17144:71e36b3d2cc4
5637 uncommitted changes are preserved. 5637 uncommitted changes are preserved.
5638 5638
5639 3. With the -C/--clean option, uncommitted changes are discarded and 5639 3. With the -C/--clean option, uncommitted changes are discarded and
5640 the working directory is updated to the requested changeset. 5640 the working directory is updated to the requested changeset.
5641 5641
5642 To cancel an uncommitted merge (and lose your changes), use
5643 :hg:`update --clean .`.
5644
5642 Use null as the changeset to remove the working directory (like 5645 Use null as the changeset to remove the working directory (like
5643 :hg:`clone -U`). 5646 :hg:`clone -U`).
5644 5647
5645 If you want to revert just one file to an older revision, use 5648 If you want to revert just one file to an older revision, use
5646 :hg:`revert [-r REV] NAME`. 5649 :hg:`revert [-r REV] NAME`.