Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/config.txt @ 22249:f5ff18f65b73
commit: change "editform" to distinguish merge commits from other (--amend)
"editform" argument for "getcommiteditor" is decided according to the
format below:
COMMAND[.ROUTE]
- COMMAND: name of command
- ROUTE: name of route, if there are two or more routes in COMMAND
This patch uses "amend.normal" and "amend.merge" as ROUTE of
"editform" instead of "amend", to distinguish merge commits from other
in "hg commit --amend" case.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 16 Aug 2014 10:43:59 +0900 |
| parents | 75618a223e18 |
| children | f3200bf460a8 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sat Aug 16 10:43:59 2014 +0900 +++ b/mercurial/help/config.txt Sat Aug 16 10:43:59 2014 +0900 @@ -394,7 +394,8 @@ messages for each actions. - ``changeset.backout`` for :hg:`backout` -- ``changeset.commit.amend`` for :hg:`commit --amend` +- ``changeset.commit.amend.merge`` for :hg:`commit --amend` on merges +- ``changeset.commit.amend.normal`` for :hg:`commit --amend` on other - ``changeset.commit.normal.merge`` for :hg:`commit` on merges - ``changeset.commit.normal.normal`` for :hg:`commit` on other - ``changeset.fetch`` for :hg:`fetch` (impling merge commit)