Mercurial > hg
view mercurial/help/hgrc.5.txt @ 22248:75618a223e18
commit: change "editform" to distinguish merge commits from others
"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 "normal.normal" and "normal.merge" as ROUTE of
"editform" instead of "normal", to distinguish merge commits from
others in "hg commit" without "--amend" case.
This patch assumes "editform" variations for "hg commit" below:
commit.normal.normal
commit.normal.merge
commit.amend.normal
commit.amend.merge
"mergeeditform" is factored out for subsequent patches. It takes
"ctxorbool" argument, because context object can't be passed in some
cases.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Sat, 16 Aug 2014 10:43:59 +0900 |
| parents | 9c963a43ecfb |
| children | 8fe5fc8d7b8e |
line wrap: on
line source
====== hgrc ====== --------------------------------- configuration files for Mercurial --------------------------------- :Author: Bryan O'Sullivan <bos@serpentine.com> :Organization: Mercurial :Manual section: 5 :Manual group: Mercurial Manual .. contents:: :backlinks: top :class: htmlonly Description =========== .. include:: hgrc.5.gendoc.txt Author ====== Bryan O'Sullivan <bos@serpentine.com>. Mercurial was written by Matt Mackall <mpm@selenic.com>. See Also ======== |hg(1)|_, |hgignore(5)|_ Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. Mercurial is copyright 2005-2014 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. .. include:: common.txt