annotate rc/hgrc @ 400:657f787fbae8

Merge remote-tracking branch 'origin/master'
author Edho Arief <edho@myconan.net>
date Tue, 04 Sep 2012 10:23:37 +0700
parents 89766794cd99
children 39d983d49349
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
cd87be0968d9 Initial import.
Edho Prima Arief <me@myconan.net>
parents:
diff changeset
1 [ui]
136
7dd9ad7f977c New name! (???)
Edho Arief <edho@myconan.net>
parents: 127
diff changeset
2 username = Edho Arief <edho@myconan.net>
10
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
3 merge = vimdiff
34
a914a2168196 Merge, removed git support.
Edho Prima Arief <me@myconan.net>
parents: 27
diff changeset
4 verbose = true
354
21c25068de14 Set default style to compact, added rebase option as default.
Edho Arief <edho@myconan.net>
parents: 332
diff changeset
5 style = compact
10
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
6
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
7 [merge-tools]
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
8 vimdiff.executable = vim
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
9 vimdiff.args = -d $base $local $output $other +close +close
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
10
14
48e869de3ebe Converter
Edho Prima Arief <me@myconan.net>
parents: 10
diff changeset
11 [extensions]
45
7e462da3caa0 [hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents: 34
diff changeset
12 #hgext.convert =
377
c0cd9f774d8d Enable progress by default.
Edho Arief <edho@myconan.net>
parents: 376
diff changeset
13 progress =
310
4b7b95cb6e09 Always use bookmarks for hg.
Edho Arief <edho@myconan.net>
parents: 294
diff changeset
14 hgext.bookmarks =
331
00777bea96fb [rc/hg] mq by default.
Edho Arief <edho@myconan.net>
parents: 310
diff changeset
15 mq =
354
21c25068de14 Set default style to compact, added rebase option as default.
Edho Arief <edho@myconan.net>
parents: 332
diff changeset
16 rebase =
375
6bf312e9a360 Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents: 354
diff changeset
17 graphlog =
376
e581a80b165c Added color for hg.
Edho Arief <edho@myconan.net>
parents: 375
diff changeset
18 color =
104
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
19
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
20 [hostfingerprints]
294
89a33efeb338 New fingerprints for bitbucket.
Edho Arief <edho@myconan.net>
parents: 142
diff changeset
21 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b
104
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
22
142
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
23 [defaults]
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
24 addremove = --similarity 100
375
6bf312e9a360 Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents: 354
diff changeset
25
6bf312e9a360 Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents: 354
diff changeset
26 [alias]
6bf312e9a360 Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents: 354
diff changeset
27 ll = log --style default
378
89766794cd99 Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents: 377
diff changeset
28
89766794cd99 Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents: 377
diff changeset
29 [bookmarks]
89766794cd99 Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents: 377
diff changeset
30 track.current = true