view gitconfig @ 30:9ccd41c4f3fe

Fix an emoji key combo, comment them and add "fearful" (for "terrified/bad shocked" rather than just "shocked")
author IBBoard <dev@ibboard.co.uk>
date Wed, 20 Apr 2016 19:48:00 +0100
parents 9bce7362e609
children dc844728d1d4
line wrap: on
line source

[user]
	name = IBBoard
	email = dev@ibboard.co.uk
[branch]
	autosetupmerge = true
[diff]
[merge]
	tool = meld
[mergetool "meld"]
	cmd = meld \\\"$BASE\\\" \\\"$LOCAL\\\" \\\"$REMOTE\\\"
[diff]
	tool = meld
[difftool "meld"]
	cmd = meld \"\" \"\"
[difftool]
	prompt = false
[push]
	default = simple