Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 21929:5bd11162c0a4 stable
commands: fix typo in import documentation
author | Wagner Bruna <wbruna@yahoo.com> |
---|---|
date | Sun, 20 Jul 2014 15:06:12 -0300 |
parents | 760f4055e656 |
children | 54ff2789d75e |
comparison
equal
deleted
inserted
replaced
21928:c67868cfe14f | 21929:5bd11162c0a4 |
---|---|
3783 even if some hunks fail to apply. Hunks that fail to apply will be | 3783 even if some hunks fail to apply. Hunks that fail to apply will be |
3784 written to a <target-file>.rej file. Conflicts can then be resolved | 3784 written to a <target-file>.rej file. Conflicts can then be resolved |
3785 by hand before :hg:`commit --amend` is run to update the created | 3785 by hand before :hg:`commit --amend` is run to update the created |
3786 changeset. This flag exists to let people import patches that | 3786 changeset. This flag exists to let people import patches that |
3787 partially apply without losing the associated metadata (author, | 3787 partially apply without losing the associated metadata (author, |
3788 date, description, ...), Note that when none of the hunk applies | 3788 date, description, ...). Note that when none of the hunk applies |
3789 cleanly, :hg:`import --partial` will create an empty changeset, | 3789 cleanly, :hg:`import --partial` will create an empty changeset, |
3790 importing only the patch metadata. | 3790 importing only the patch metadata. |
3791 | 3791 |
3792 To read a patch from standard input, use "-" as the patch name. If | 3792 To read a patch from standard input, use "-" as the patch name. If |
3793 a URL is specified, the patch will be downloaded from it. | 3793 a URL is specified, the patch will be downloaded from it. |