Commit Diff


commit - 671dfedb5e61678758d8cace389e88ee23a5a436
commit + 071f7ad8fc03d5733d12761bc28dc049a4b31acf
blob - d56fe7c6587946c17897691eebaaf120a3d920e8
blob + 1e2fed60eaaf2fe412397e99f86fa1461940805a
--- notes-pull-push
+++ notes-pull-push
@@ -69,15 +69,33 @@ got commit
 
 repo/gotconfig syntax ideas:
 
-remote "openbsd" server ssh://got.openbsd.org user stsp
-remote "my_mirror" server ssh://got.stsp.name user stsp
-remote "my_mirror_anonssh" server ssh://got.stsp.name user anonymous
-remote "my_mirror_https" server https://got.stsp.name # no auth creds, read-only
+# remote private mirrors
+remote "openbsd_src" repository "src" server ssh://got.openbsd.org user stsp
+remote "my_src_mirror" repository "src" server ssh://got.stsp.name user stsp
 
-branch master pull-from my_mirror_anonssh sync-to openbsd
+# remote public mirrors
+remote "public_src_mirror_anonssh" repository "src" server ssh://got.stsp.name \
+    user anonymous
+# no authentication credentials for this remote since https is read-only
+remote "public_src_mirror" repository "src" server https://got.stsp.name
+
+# read from local mirror and push to main server
 # "sync-to" enables push by default with 'got commit'
-# implied mapping: refs/heads/master <-> refs/remotes/openbsd/master
+# implied mapping: refs/heads/master <-> refs/remotes/openbsd_src/master
+branch master pull-from my_src_mirror sync-to openbsd_src
 
-branch my_branch pull-from my_mirror_anonssh push-to my_mirror
+# read from local mirror and push to local mirror
 # "push-to" means commit locally, push manually
-# implied mapping: refs/heads/my_branch <-> refs/remotes/my_mirror/my_branch
+# implied mapping: refs/heads/my_branch <-> refs/remotes/my_src_mirror/my_branch
+branch my_branch pull-from my_src_mirror push-to my_src_mirror
+
+# read-only access, anoncvs-style
+branch master pull-from public_src_mirror_anonssh
+
+# read-only access over https
+branch master pull-from public_src_mirror
+
+# we can also use git terminology when naming remotes, of course:
+remote "origin" repository "src" server https://got.openbsd.example.com
+branch master pull-from origin
+# implied mapping: refs/heads/master <-> refs/remotes/origin/master