2 username = Meredith Howard <mhoward@roomag.org> |
2 username = Meredith Howard <mhoward@roomag.org> |
3 merge = vimdiff |
3 merge = vimdiff |
4 logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" |
4 logtemplate = "{phaseset} -{label('logcust.decorate', decorate)} {desc|strip|firstline} {label('logcust.date', "({date|age})")} {label('logcust.user' , "<{author|person}>")}\n" |
5 |
5 |
6 [extensions] |
6 [extensions] |
7 color = |
|
8 graphlog = |
|
9 pager = |
|
10 progress = |
|
11 rebase = |
7 rebase = |
12 record = |
|
13 shelve = |
8 shelve = |
14 histedit = |
9 histedit = |
15 |
10 |
16 [pager] |
11 [pager] |
17 pager = LESS='FSRXi' less |
12 pager = LESS='FSRXi' less |
18 |
13 |
19 [alias] |
14 [alias] |
20 alias = !$HG config alias | grep -v 'alias.alias' | perl -ne 's/^alias\.// and s/=/#= / and print' | column -t -s# |
15 alias = !$HG config alias | grep -v 'alias.alias' | perl -ne 's/^alias\.// and s/=/#= / and print' | column -t -s# |
21 fetch = pull --rebase |
16 fetch = pull --rebase |
22 rec = record |
17 rec = commit -i |
23 unrec = revert -iC |
18 record = commit -i |
24 ctags = !~/bin/git-ctags |
19 crecord = !hg commit -i --config ui.interface=curses |
25 draft = log -r 'reverse(not public())' |
20 unrec = revert -iC |
|
21 ctags = !~/bin/git-ctags |
|
22 glog = log -G |
|
23 draft = log -r 'reverse(not public())' |
26 |
24 |
27 [merge-tools] |
25 [merge-tools] |
28 vimdiff.executable = vim |
26 vimdiff.executable = vim |
29 vimdiff.args = -d -c 'hid|hid' $base $local $output $other |
27 vimdiff.args = -d -c 'hid|hid' $base $local $output $other |
30 vimdiff.check = changed, conflicts |
28 vimdiff.check = changed, conflicts |