Wed, 22 Sep 2021 16:34:57 -0400
Add sick "run anywhere ignoring bundler" hacks
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
1 | [ui] |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
2 | username = Meredith Howard <mhoward@roomag.org> |
881 | 3 | merge = vimdiff3 |
844
d82511ead246
Add topics to log template
Meredith Howard <mhoward@roomag.org>
parents:
843
diff
changeset
|
4 | logtemplate = "{logcust}" |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
5 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
6 | [extensions] |
209 | 7 | rebase = |
8 | shelve = | |
9 | histedit = | |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
10 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
11 | [pager] |
506 | 12 | pager = LESS='FSRXi' less |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
13 | |
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
14 | [alias] |
842
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
15 | fetch = pull --rebase |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
16 | rec = commit -i |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
17 | record = commit -i |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
18 | crecord = !hg commit -i --config ui.interface=curses |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
19 | unrec = revert -iC |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
20 | ctags = !~/bin/git-ctags |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
21 | glog = log -G |
2f6183deac5a
Remove merged extensions
Meredith Howard <mhoward@roomag.org>
parents:
830
diff
changeset
|
22 | draft = log -r 'reverse(not public())' |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
23 | |
79 | 24 | [merge-tools] |
881 | 25 | vimdiff3.executable = vim |
26 | vimdiff3.args = -f -d -M $local $base $other $output -c 'hid|hid|hid|set ma write' | |
27 | vimdiff3.check = changed, conflicts | |
28 | vimdiff3.premerge = keep-merge3 | |
79 | 29 | |
222 | 30 | [diff] |
598
1698d432a2eb
add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents:
597
diff
changeset
|
31 | git = true |
222 | 32 | showfunc = true |
33 | ||
845
682c71a60aad
Move log templates & colors to include file
Meredith Howard <mhoward@roomag.org>
parents:
844
diff
changeset
|
34 | %include ~/.hgrc.logtemplates |
591
2ee456c483b0
switch to a file just for extra extensions via script
Meredith Howard <mhoward@roomag.org>
parents:
506
diff
changeset
|
35 | %include ~/.hgext/hgrc |
8
ba72a71f23e6
Add mercurial config and hgflow extension
Meredith Howard <mhoward@roomag.org>
parents:
diff
changeset
|
36 | %include ~/.hgrc.local |