Mercurial > repos > other > linux
annotate gitconfig @ 116:d2c73b0b5c36
Add a combining underline
Used (imperfectly) in https://twitter.com/IBBoard/status/1004067517751549957
author | IBBoard <dev@ibboard.co.uk> |
---|---|
date | Mon, 09 Jul 2018 20:08:20 +0100 |
parents | dc844728d1d4 |
children | c3320f06d412 |
rev | line source |
---|---|
4 | 1 [user] |
2 name = IBBoard | |
3 email = dev@ibboard.co.uk | |
4 [branch] | |
5 autosetupmerge = true | |
6 [diff] | |
7 [merge] | |
8 tool = meld | |
9 [mergetool "meld"] | |
10 cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\" | |
11 [diff] | |
12 tool = meld | |
13 [difftool "meld"] | |
14 cmd = meld \"\" \"\" | |
15 [difftool] | |
16 prompt = false | |
29
9bce7362e609
Default to simple git push for fairly sane behaviour
IBBoard <dev@ibboard.co.uk>
parents:
13
diff
changeset
|
17 [push] |
9bce7362e609
Default to simple git push for fairly sane behaviour
IBBoard <dev@ibboard.co.uk>
parents:
13
diff
changeset
|
18 default = simple |
65
dc844728d1d4
Add an include to allow username overrides on other systems
IBBoard <dev@ibboard.co.uk>
parents:
29
diff
changeset
|
19 [include] |
dc844728d1d4
Add an include to allow username overrides on other systems
IBBoard <dev@ibboard.co.uk>
parents:
29
diff
changeset
|
20 path = ~/.gitconfig-override |