annotate gitconfig @ 24:acbc487533ab

Consistently fix Thunderbird time settings by moving some bits to profile, not bashrc
author IBBoard <dev@ibboard.co.uk>
date Sat, 24 Oct 2015 15:48:50 +0100
parents c7241e9025b8
children 9bce7362e609
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