Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

threesome.vim for merges

  • Loading branch information...
commit 47bdf5bd2389cafb00bb1418faafb3e2803e6573 1 parent d7b2249
@julienXX authored
Showing with 20 additions and 5 deletions.
  1. +20 −5 gitconfig
View
25 gitconfig
@@ -1,24 +1,30 @@
[github]
user = julienXX
token = e8eda04536d1a3339818db5d06168a0f
+
[user]
email = julien@sideburns.eu
name = Julien Blanchard
+
[color]
ui = auto
+
[color "branch"]
current = yellow reverse
local = yellow
remote = green
+
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
+
[color "status"]
added = yellow
changed = green
untracked = cyan
+
[alias]
st = status -s
ci = commit
@@ -27,26 +33,35 @@
df = diff
lg = log -p
caa = commit -a --amend -C HEAD
-[merge]
- tool = vim
-[mergetool "vim"]
- cmd=/usr/local/bin/vim -d -g $LOCAL $MERGED $REMOTE
- keepbackup=false
+
[url "git@github.com:"]
insteadOf = "gh:"
pushInsteadOf = "github:"
pushInsteadOf = "git://github.com/"
+
[url "git://github.com/"]
insteadOf = "github:"
+
[url "git@gist.github.com:"]
insteadOf = "gst:"
pushInsteadOf = "gist:"
pushInsteadOf = "git://gist.github.com/"
+
[url "git://gist.github.com/"]
insteadOf = "gist:"
+
[url "git@heroku.com:"]
insteadOf = "heroku:"
+
[help]
autocorrect = 5
+
[core]
excludesfile = /Users/julien/.gitignore_global
+
+[merge]
+ tool = threesome
+
+[mergetool "threesome"]
+ cmd = "mvim -f $BASE $LOCAL $REMOTE $MERGED -c 'ThreesomeInit'"
+ trustExitCode = true
Please sign in to comment.
Something went wrong with that request. Please try again.