summaryrefslogtreecommitdiffstats
path: root/gitmirror
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-10-30 10:05:18 -0700
committerH. Peter Anvin <hpa@zytor.com>2008-10-30 10:05:18 -0700
commita99cf1d4afc3a362d6ad54b36247ea33b58c8497 (patch)
treef9775af42c4eb2047ecc8b531447aaa62e8d2181 /gitmirror
parent090148202cb7be0012821d081ec3520662f3fb37 (diff)
downloadnasmbuild-a99cf1d4afc3a362d6ad54b36247ea33b58c8497.tar.gz
nasmbuild-a99cf1d4afc3a362d6ad54b36247ea33b58c8497.tar.xz
nasmbuild-a99cf1d4afc3a362d6ad54b36247ea33b58c8497.zip
gitmirror: update .gitignore and git.config
Update .gitignore and git.config for the new "mirror universe". Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'gitmirror')
-rw-r--r--gitmirror/.gitignore1
-rw-r--r--gitmirror/git.config14
2 files changed, 7 insertions, 8 deletions
diff --git a/gitmirror/.gitignore b/gitmirror/.gitignore
index f91bad4..f76371a 100644
--- a/gitmirror/.gitignore
+++ b/gitmirror/.gitignore
@@ -1,2 +1,3 @@
/LAST_EMAIL
/git
+/nasm.git
diff --git a/gitmirror/git.config b/gitmirror/git.config
index bf5f05b..0320729 100644
--- a/gitmirror/git.config
+++ b/gitmirror/git.config
@@ -1,15 +1,13 @@
[core]
repositoryformatversion = 0
filemode = true
- bare = false
- logallrefupdates = true
+ bare = true
[remote "origin"]
+ mirror = true
url = git://repo.or.cz/nasm.git
- fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
- remote = origin
- merge = refs/heads/master
+ fetch = +refs/*:refs/*
[remote "zytor"]
+ mirror = true
url = /pub/git/nasm/nasm.git
- fetch = +refs/heads/*:refs/remotes/zytor/*
- push = +refs/remotes/origin/*:refs/heads/*
+ fetch = +refs/*:refs/*
+ push = +refs/*:refs/*