Mercurial > evolve
changeset 777:1ff262281a1d stable
doc: rework how to entry about amend
We can recommand the core `hg commit --amend` now. We also drop reference to MQ.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Wed, 22 Jan 2014 14:10:24 -0800 |
| parents | 03844e1fbfe6 |
| children | 35c8c5e8e3d3 |
| files | docs/evolve-faq.rst |
| diffstat | 1 files changed, 4 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Thu Jan 09 21:37:52 2014 -0800 +++ b/docs/evolve-faq.rst Wed Jan 22 14:10:24 2014 -0800 @@ -12,13 +12,12 @@ Just use commit as usual. New changesets will be in the `draft` phase. -Rewrite a changeset: ``amend`` +Rewrite a changeset: ``commit --amend`` ------------------------------------------------------------ -A new command ``hg amend`` is added by the extension. It writes a new -changeset combining working-directory parent changes and parent. It -will work on any `draft` or `secret` changeset. It will not work on -`public` changesets. +It writes a new changeset combining working-directory parent changes and parent. +It will work on any `draft` or `secret` changeset. It will not work on `public` +changesets. To understand what the result of amend will be I use the two following aliases [#]_:: @@ -29,20 +28,9 @@ # status what amend will look like pstatus=status --rev .^ -It takes various options to pick an author, a date, and the branch of the -result (see ``hg help amend`` for details). - This command can even be invoked on changesets with children, provided none are public. -.. note:: As the amend command is very similar to mq's ``qrefresh``, a ``refresh`` - alias for amend is also available. But note that contrary to - ``qrefresh``, ``amend`` does not exclude changes on file not specified - on the command line. - - XXX add idank example - - .. [#] (defined by the evolve extension for you)