Mercurial > ec-dotfiles
annotate rc/hgrc @ 394:e0726df9196f
Merge branch 'master' into rhel5
author | Edho Arief <edho@myconan.net> |
---|---|
date | Wed, 01 Aug 2012 15:28:42 +0700 |
parents | 39d983d49349 |
children | 660e9a148400 |
rev | line source |
---|---|
0 | 1 [ui] |
136 | 2 username = Edho Arief <edho@myconan.net> |
10 | 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 | 6 |
7 [merge-tools] | |
8 vimdiff.executable = vim | |
9 vimdiff.args = -d $base $local $output $other +close +close | |
10 | |
14 | 11 [extensions] |
45
7e462da3caa0
[hg] Comment sometimes unavailable extension.
Edho Prima Arief <me@myconan.net>
parents:
34
diff
changeset
|
12 #hgext.convert = |
379
39d983d49349
Branched, removed progress extension on rhel5.
Edho Arief <edho@myconan.net>
parents:
378
diff
changeset
|
13 #progress = |
310 | 14 hgext.bookmarks = |
331 | 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 | 18 color = |
104 | 19 |
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 | 22 |
142 | 23 [defaults] |
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 |