diff --git a/htdocs/svnwrite.html b/htdocs/svnwrite.html index a1346be1..4873991a 100644 --- a/htdocs/svnwrite.html +++ b/htdocs/svnwrite.html @@ -25,6 +25,7 @@ maintainers and significant developers.
refs/users/username/heads
with tags
+ in refs/users/username/tags
.refs/vendors/vendor-name/heads
with tags
+ in refs/vendors/vendor-name/tags
.+ +this will cause+git config --add remote.origin.fetch "+refs/vendors/IBM/heads/*:refs/remotes/origin/IBM/*" +git config --add remote.origin.fetch "+refs/vendors/IBM/tags/*:refs/tags/IBM/*" +
git pull
to fetch all the additional
+branches and make them available locally
+under remotes/origin/IBM
and will also add any tags under
+the sub-namespace IBM
.
+
+Setting up a tracking branch for one of the upstream vendor branches
+is slightly more complicated as git branch
+--set-upstream-to
does not work properly. However, it is
+possible to configure the branch information directly. First, check
+out the branch you want to track, for example, to check out the
+arm-9-branch
use something like:
+
++ +then change the merge property for the branch to corectly identify the +upstream source + ++git checkout -b ARM/arm-9-branch origin/ARM/arm-9-branch +
+ +Pull operations will now correctly track the upstream branch. + +It is also possible to set up push operations so that local changes will be pushed to the private namespace. For example, if you mirror your own private git information with + ++git config branch.ARM/arm-9-branch.merge refs/vendors/ARM/heads/arm-9-branch +
+ +then you can also add ++git config --add remote.origin.fetch "+refs/users/my-userid/heads/*:refs/remotes/origin/me/*" +
+and then any push from a branch that begins with+git config --add remote.origin.push "+refs/heads/me/*:refs/users/my-userid/heads/*" +
me/
will be pushed to the private area.
+