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
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]
470
f8397bdc0cbc Change username for git.
edogawaconan <me@myconan.net>
parents: 469
diff changeset
2 username = edogawaconan <me@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
473
1ed4d4c449a6 Add global hgignore.
edogawaconan <me@myconan.net>
parents: 470
diff changeset
6 ignore = ~/.hgignore_global
1ed4d4c449a6 Add global hgignore.
edogawaconan <me@myconan.net>
parents: 470
diff changeset
7 ignore.local = ~/.hgignore_global.local
10
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
8
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
9 [merge-tools]
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
10 vimdiff.executable = vim
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
11 vimdiff.args = -d $base $local $output $other +close +close
876f2c45eeae Use vimdiff for merging.
Edho Prima Arief <me@myconan.net>
parents: 0
diff changeset
12
14
48e869de3ebe Converter
Edho Prima Arief <me@myconan.net>
parents: 10
diff changeset
13 [extensions]
459
7d4b2c464824 Enable convert by default.
Edho Arief <edho@myconan.net>
parents: 458
diff changeset
14 convert =
458
70bdcc6375b8 Enable progress by default.
Edho Arief <edho@myconan.net>
parents: 457
diff changeset
15 progress =
457
2455ac4a9c74 hgext isn't needed.
Edho Arief <edho@myconan.net>
parents: 406
diff changeset
16 bookmarks =
331
00777bea96fb [rc/hg] mq by default.
Edho Arief <edho@myconan.net>
parents: 310
diff changeset
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
e581a80b165c Added color for hg.
Edho Arief <edho@myconan.net>
parents: 375
diff changeset
20 color =
469
1f8fb10740b0 Use record extension by default.
Edho Arief <edho@myconan.net>
parents: 459
diff changeset
21 record =
487
ec49852111cb Enable mercurial pager.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
22 pager =
489
6ef30abe29f9 Enable hg purge.
edogawaconan <me@myconan.net>
parents: 487
diff changeset
23 purge =
104
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
24
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
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
ed3d1b8e6f45 bitbucket fingerprint.
Edho Prima Arief <edho@myconan.net>
parents: 91
diff changeset
27
142
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
28 [defaults]
6a43fa890c93 Rename autodetection.
Edho Arief <edho@myconan.net>
parents: 136
diff changeset
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
ec49852111cb Enable mercurial pager.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
34 [pager]
ec49852111cb Enable mercurial pager.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
35 pager = LESS=FRX less
ec49852111cb Enable mercurial pager.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
36 attend = annotate, cat, diff, export, glog, log, qdiff, heads
ec49852111cb Enable mercurial pager.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
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
347e30690879 Add local hg config file.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
40
347e30690879 Add local hg config file.
edogawaconan <me@myconan.net>
parents: 473
diff changeset
41 %include ~/.hgrc.local