Index: user/uqs/git_conv/base-head.git/.git/config
===================================================================
--- user/uqs/git_conv/base-head.git/.git/config	(revision 311294)
+++ user/uqs/git_conv/base-head.git/.git/config	(revision 311295)
@@ -1,14 +1,15 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = false
 	logallrefupdates = true
 [svn-remote "svn"]
 	rewriteRoot = svn+ssh://svn.freebsd.org/base
 	url = file:///home/svn/base
 	fetch = head:refs/remotes/trunk
 [push]
 	default = matching
 [remote "github"]
-	url = src.github.com:freebsd/freebsd.git
+	url = base.github.com:freebsd/freebsd.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/remotes/trunk:refs/heads/svn_head
Index: user/uqs/git_conv/doc-head.git/.git/config
===================================================================
--- user/uqs/git_conv/doc-head.git/.git/config	(revision 311294)
+++ user/uqs/git_conv/doc-head.git/.git/config	(revision 311295)
@@ -1,16 +1,15 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = false
 	logallrefupdates = true
 [svn-remote "svn"]
 	rewriteRoot = svn+ssh://svn.freebsd.org/doc
 	url = file:///home/svn/doc
 	fetch = head:refs/remotes/trunk
-	branches = {www}:refs/remotes/*
 [push]
 	default = matching
 [remote "github"]
 	url = doc.github.com:freebsd/freebsd-doc.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/remotes/trunk:refs/heads/svn_head
-	push = +refs/remotes/www:refs/heads/svn_www
Index: user/uqs/git_conv/freebsd-base.git/config
===================================================================
--- user/uqs/git_conv/freebsd-base.git/config	(revision 311294)
+++ user/uqs/git_conv/freebsd-base.git/config	(revision 311295)
@@ -1,20 +1,21 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = true
 [push]
 	default = matching
 [remote "github"]
 	url = base.github.com:freebsd/freebsd.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/heads/master:refs/heads/master
 	push = +refs/heads/projects/*:refs/heads/projects/*
 	push = +refs/heads/release/*:refs/heads/release/*
 	push = +refs/heads/releng/*:refs/heads/releng/*
 	push = +refs/heads/stable/*:refs/heads/stable/*
 	push = +refs/heads/user/*:refs/heads/user/*
 	push = +refs/notes/*:refs/notes/*
 [remote "bitbucket"]
 	url = ssh://git@bitbucket.org/freebsd/freebsd-base.git
 	push = +refs/heads/master:refs/heads/master
 	push = +refs/heads/stable/*:refs/heads/stable/*
 	push = +refs/notes/*:refs/notes/*
Index: user/uqs/git_conv/freebsd-doc.git/config
===================================================================
--- user/uqs/git_conv/freebsd-doc.git/config	(revision 311294)
+++ user/uqs/git_conv/freebsd-doc.git/config	(revision 311295)
@@ -1,12 +1,13 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = true
 [push]
 	default = matching
 [remote "github"]
 	url = doc.github.com:freebsd/freebsd-doc.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/heads/master:refs/heads/master
 	push = +refs/heads/projects/*:refs/heads/projects/*
 	push = +refs/heads/release/*:refs/heads/release/*
 	push = +refs/notes/*:refs/notes/*
Index: user/uqs/git_conv/freebsd-ports.git/config
===================================================================
--- user/uqs/git_conv/freebsd-ports.git/config	(revision 311294)
+++ user/uqs/git_conv/freebsd-ports.git/config	(revision 311295)
@@ -1,12 +1,13 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = true
 [push]
 	default = matching
 [remote "github"]
 	url = ports.github.com:freebsd/freebsd-ports.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/heads/branches/*:refs/heads/branches/*
 	push = +refs/heads/master:refs/heads/master
 	push = +refs/heads/projects/*:refs/heads/projects/*
 	push = +refs/notes/*:refs/notes/*
Index: user/uqs/git_conv/ports-head.git/.git/config
===================================================================
--- user/uqs/git_conv/ports-head.git/.git/config	(revision 311294)
+++ user/uqs/git_conv/ports-head.git/.git/config	(revision 311295)
@@ -1,14 +1,15 @@
 [core]
 	repositoryformatversion = 0
 	filemode = true
 	bare = false
 	logallrefupdates = true
 [svn-remote "svn"]
 	rewriteRoot = svn+ssh://svn.freebsd.org/ports
 	url = file:///home/svn/ports
 	fetch = head:refs/remotes/trunk
 [push]
 	default = matching
 [remote "github"]
 	url = ports.github.com:freebsd/freebsd-ports.git
+	fetch = +refs/heads/*:refs/remotes/github/*
 	push = +refs/remotes/trunk:refs/heads/svn_head