annotate .hgrc @ 144:c9577c9af631

add a command for the alias i always forget
author Jeff Hammel <jhammel@mozilla.com>
date Tue, 07 Jun 2011 17:11:46 -0700
parents c0bd17a8033b
children 60c8a2506630
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]
57
aa97f8ac0cbe change username to mozilla login since i dont want to change this for each repository
Jeff Hammel <jhammel@mozilla.com>
parents: 54
diff changeset
2 username = Jeff Hammel <jhammel@mozilla.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
116
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
8 diff = -p -U 8
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
9 qdiff = -p -U 8
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
10 qnew = -U
68
3c1f9b412675 adding some stuff
Jeff Hammel <jhammel@mozilla.com>
parents: 57
diff changeset
11 repository_host = k0s.org/hg
121
c0bd17a8033b set some more sensible defaults
Jeff Hammel <jhammel@mozilla.com>
parents: 116
diff changeset
12 pull = --rebase
c0bd17a8033b set some more sensible defaults
Jeff Hammel <jhammel@mozilla.com>
parents: 116
diff changeset
13 revert = --no-backup
116
2a83052a7a50 add hg defaults from http://blog.bonardo.net/2010/06/22/so-youre-about-to-use-checkin-needed
Jeff Hammel <jhammel@mozilla.com>
parents: 87
diff changeset
14
27
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
15 [diff]
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
16 git = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
17 showfunc = 1
3b88a6c02421 update hgrc settings wrt https://developer.mozilla.org/en/Mercurial_FAQ
Jeff Hammel <k0scist@gmail.com>
parents: 18
diff changeset
18 unified = 8
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
19
53
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
20 [extensions]
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
21 hgext.mq =
87
c4126b9a185f add the rebase extension to be enabled in hg
Jeff Hammel <jhammel@mozilla.com>
parents: 68
diff changeset
22 rebase =
53
bd91a6bc85cd enable mercurial queues
Jeff Hammel <k0scist@gmail.com>
parents: 27
diff changeset
23
18
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
24 [trusted]
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
25 users = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
26 groups = jhammel
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
27
ae0ffe7c9040 modify contact information for hg
k0s <k0scist@gmail.com>
parents: 0
diff changeset
28 [web]
68
3c1f9b412675 adding some stuff
Jeff Hammel <jhammel@mozilla.com>
parents: 57
diff changeset
29 allow_archive = rss, zip, bz2
3c1f9b412675 adding some stuff
Jeff Hammel <jhammel@mozilla.com>
parents: 57
diff changeset
30 contact = jhammel at mozilla dot com