Merge remote-tracking branch 'upstream/master'

[16.git] / git_con.fig

diff --git a/git_con.fig b/git_con.fig
index 1712ab98858cf727f9aec24535630217fae36bd0..f07fc6d50c117935b4b73742eef2dd5519f36111 100755 (executable)
--- a/git_con.fig
+++ b/git_con.fig
@@ -5,7 +5,7 @@
        logallrefupdates = true
 [remote "x4"]
        url = ssh://sparky4@4ch.mooo.com:26/var/www/16/16.git
-       fetch = +refs/heads/*:refs/remotes/origin/*
+       fetch = +refs/heads/*:refs/remotes/x4/*
 [branch "master"]
        remote = origin
        merge = refs/heads/master
@@ -16,5 +16,8 @@
        url = ssh://sparky4q@git.code.sf.net/p/project16/code
        fetch = +refs/heads/*:refs/remotes/sf/*
 [remote "jp"]
-       url = ssh://sparky4@git.pf.osdn.jp:/gitroot/s/sp/sparky4/project16.git
+       url = ssh://sparky4@git.osdn.jp:/gitroot/proj16/16.git
        fetch = +refs/heads/*:refs/remotes/jp/*
+[remote "bb"]
+       url = git@bitbucket.org:sparky4/16.git
+       fetch = +refs/heads/*:refs/remotes/bb/*