subfilter branch created - please enable with these steps...

6 views
Skip to first unread message

Jim Hargrave

unread,
Feb 24, 2012, 3:14:30 PM2/24/12
to okapi...@googlegroups.com
Do this on the command line (egit would work too but this is easier):

1. enable remote tracking so your local subfilter branch is always matched to the remote origin/subfilter - add this to the bottom of .git/config:
[branch "subfilter"]
remote = origin
merge = refs/heads/subfilter
2. git checkout -b subfilter origin/subfilter
3. git pull

Now you are on the subfilter branch. To switch back to master do this:
git checkout master or in egit Teams -> Switch To -> master

**NOTE - the subfilter branch probably won't even compile for a while as we slowly make the needed changes to impalementers of IFilter

Jim


Chase Tingley

unread,
Feb 24, 2012, 7:28:44 PM2/24/12
to okapi...@googlegroups.com
You can also set up branch tracking directly without having to edit .git/config.

First, git pull (or git fetch) so your repo knows about the new branch on the server:
tingley@ruffian:~/src/okapi$ git pull
[...]
   7abffef..23e6fe2  master     -> origin/master
 * [new branch]      subfilter  -> origin/subfilter

Then, use "branch -t" to create a new branch that tracks something upstream:

tingley@ruffian:~/src/okapi$ git branch -t subfilter origin/subfilter
Branch subfilter set up to track remote branch subfilter from origin.

Now, you can "git checkout subfilter" and start working on the branch.

I find this a little easier than trying to remember the .git/config syntax.

ct

Jimbo

unread,
Feb 24, 2012, 7:30:55 PM2/24/12
to okapi...@googlegroups.com
Nice! thanks - picking this up little by little

Jim
Reply all
Reply to author
Forward
0 new messages