Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hg.1.txt @ 608:d2994b5298fb
Add username/merge/editor to .hgrc
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Add username/merge/editor to .hgrc
These take priority over the equivalent environment vars
Deprecate HGMERGE, HGUSER, and HGEDITOR in docs
Add ui section to docs
Remove undocumented HG_OPTS
Raise username code out of changelog class
Make tests ignore ~/.hgrc
manifest hash: d127ef02bc5266036b4c77a55319519e91bd475b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyM5NywK+sNU5EO8RAuU7AJ9zKk1TFrJXHM04jOOJJeBSp8jlTgCeP+tr
qwGFd+WaNqTepZ0wun5g9Uc=
=QEBu
-----END PGP SIGNATURE-----
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 03 Jul 2005 21:51:09 -0800 |
parents | ea4526f9b1a5 |
children | 9cd745437269 |
line wrap: on
line diff
--- a/doc/hg.1.txt +++ b/doc/hg.1.txt @@ -415,7 +415,9 @@ ENVIRONMENT VARIABLES HGEDITOR:: This is the name of the editor to use when committing. Defaults to the - value of EDITOR. + value of EDITOR. + + (deprecated, use .hgrc) HGMERGE:: An executable to use for resolving merge conflicts. The program @@ -425,9 +427,13 @@ HGMERGE:: The default program is "hgmerge", which is a shell script provided by Mercurial with some sensible defaults. + (deprecated, use .hgrc) + HGUSER:: This is the string used for the author of a commit. + (deprecated, use .hgrc) + EMAIL:: If HGUSER is not set, this will be used as the author for a commit. @@ -458,6 +464,21 @@ FILES This file contains defaults and configuration. Values in .hg/hgrc override those in .hgrc. + +UI OPTIONS +---------- + +Various configuration options can be set in .hgrc: + +------------- +[ui] +verbose = 0 +username = Matt Mackall <mpm@selenic.com> +editor = hgeditor +merge = hgmerge +------------- + + NAMED REPOSITORIES ------------------