Mercurial > hg > config

annotate .hgrc @ 54:82d24a65cb0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use meld as merge program
author Jeff Hammel <k0scist@gmail.com>
date Tue, 30 Mar 2010 08:22:49 -0700
parents bd91a6bc85cd
children aa97f8ac0cbe
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
f3ab51c79813 adding configuration from https://svn.openplans.org/svn/config_jhammel/
k0s <k0scist@gmail.com>
parents:
diff changeset
1 [ui]
27
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
2 username = Jeff Hammel <k0scist@gmail.com>
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
3 ignore = /home/jhammel/.hgignore
54
82d24a65cb0d use meld as merge program
Jeff Hammel <k0scist@gmail.com>
parents: 53
diff changeset
4 merge = meld
27
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
5
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
6 [defaults]
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
7 commit = -v
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
8
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
9 [diff]
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
10 git = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
11 showfunc = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
12 unified = 8
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
13
53
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
14 [extensions]
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
15 hgext.mq =
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
16
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
17 [trusted]
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
18 users = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
19 groups = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
20
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
21 [web]
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
22 allow_archive = zip, bz2
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
23 contact = k0scist at gmail