Mercurial > repos > other > linux

annotate gitconfig @ 116:d2c73b0b5c36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
1 [user]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
2 name = IBBoard
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
3 email = dev@ibboard.co.uk
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
4 [branch]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
5 autosetupmerge = true
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
6 [diff]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
7 [merge]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
8 tool = meld
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
9 [mergetool "meld"]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
10 cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\"
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
11 [diff]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
12 tool = meld
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
13 [difftool "meld"]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
14 cmd = meld \"\" \"\"
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
15 [difftool]
2c7cac745457 * Add git config
IBBoard <dev@ibboard.co.uk>
parents:
diff changeset
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