Mercurial > repos > other > linux

diff gitconfig @ 4:2c7cac745457

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Add git config * Add SSH public key
author IBBoard <dev@ibboard.co.uk>
date Sat, 27 Jul 2013 20:32:10 +0100
parents
children c7241e9025b8
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gitconfig	Sat Jul 27 20:32:10 2013 +0100
@@ -0,0 +1,18 @@
+[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