.hgrc

Wed, 28 Jul 2021 01:34:01 -0500

author
Meredith Howard <mhoward@roomag.org>
date
Wed, 28 Jul 2021 01:34:01 -0500
changeset 931
55c477df9d1b
parent 881
a5b3b7b6850c
permissions
-rw-r--r--

whoops

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
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 845
diff changeset
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
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
7 rebase =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
8 shelve =
557d2468f900 Update hg extensions
Meredith Howard <mhoward@roomag.org>
parents: 198
diff changeset
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
2a6899f40b2e smartcase please
Meredith Howard <mhoward@roomag.org>
parents: 443
diff changeset
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
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
24 [merge-tools]
881
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 845
diff changeset
25 vimdiff3.executable = vim
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 845
diff changeset
26 vimdiff3.args = -f -d -M $local $base $other $output -c 'hid|hid|hid|set ma write'
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 845
diff changeset
27 vimdiff3.check = changed, conflicts
a5b3b7b6850c mergetool fixes
Meredith Howard <mhoward@roomag.org>
parents: 845
diff changeset
28 vimdiff3.premerge = keep-merge3
79
4635b3f5bc23 Easier vimdiff defaults
Meredith Howard <mhoward@roomag.org>
parents: 8
diff changeset
29
222
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
30 [diff]
598
1698d432a2eb add gh schemes, why not
Meredith Howard <mhoward@roomag.org>
parents: 597
diff changeset
31 git = true
222
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
32 showfunc = true
1dc0597fe712 Nicer diffs
Meredith Howard <mhoward@roomag.org>
parents: 219
diff changeset
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

mercurial