Mercurial > ec-dotfiles
annotate rc/hgrc @ 490:f064197f160d
Merge.
author | edogawaconan <me@myconan.net> |
---|---|
date | Fri, 08 Nov 2013 15:13:41 +0900 |
parents | 6ef30abe29f9 347e30690879 |
children | c3c2353044ad |
rev | line source |
---|---|
0 | 1 [ui] |
470 | 2 username = edogawaconan <me@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 |
473 | 6 ignore = ~/.hgignore_global |
7 ignore.local = ~/.hgignore_global.local | |
10 | 8 |
9 [merge-tools] | |
10 vimdiff.executable = vim | |
11 vimdiff.args = -d $base $local $output $other +close +close | |
12 | |
14 | 13 [extensions] |
459 | 14 convert = |
458 | 15 progress = |
457 | 16 bookmarks = |
331 | 17 mq = |
354
21c25068de14
Set default style to compact, added rebase option as default.
Edho Arief <edho@myconan.net>
parents:
332
diff
changeset
|
18 rebase = |
375
6bf312e9a360
Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents:
354
diff
changeset
|
19 graphlog = |
376 | 20 color = |
469
1f8fb10740b0
Use record extension by default.
Edho Arief <edho@myconan.net>
parents:
459
diff
changeset
|
21 record = |
487 | 22 pager = |
489 | 23 purge = |
104 | 24 |
25 [hostfingerprints] | |
294
89a33efeb338
New fingerprints for bitbucket.
Edho Arief <edho@myconan.net>
parents:
142
diff
changeset
|
26 bitbucket.org = 24:9c:45:8b:9c:aa:ba:55:4e:01:6d:58:ff:e4:28:7d:2a:14:ae:3b |
104 | 27 |
142 | 28 [defaults] |
29 addremove = --similarity 100 | |
375
6bf312e9a360
Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents:
354
diff
changeset
|
30 |
6bf312e9a360
Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents:
354
diff
changeset
|
31 [alias] |
6bf312e9a360
Added alias, added graphlog extension.
Edho Arief <edho@myconan.net>
parents:
354
diff
changeset
|
32 ll = log --style default |
378
89766794cd99
Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents:
377
diff
changeset
|
33 |
487 | 34 [pager] |
35 pager = LESS=FRX less | |
36 attend = annotate, cat, diff, export, glog, log, qdiff, heads | |
37 | |
378
89766794cd99
Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents:
377
diff
changeset
|
38 [bookmarks] |
89766794cd99
Readd bookmark's track.current in hg.
Edho Arief <edho@myconan.net>
parents:
377
diff
changeset
|
39 track.current = true |
485 | 40 |
41 %include ~/.hgrc.local |