Re: Tracking a branch using StGIT

[Jakub Narebski <jnareb@gmail.com>]

Rajkumar S wrote:

> On 9/15/06, Jakub Narebski <jnareb@gmail.com> wrote:
> 
>> git pull is git fetch + merge of first head in remotes file with _current_
>> branch.
> 
> I was under the impression that git pull is git pull + merge of
> corresponding branches in remotes files. ie master -> origin and
> RELENG_1 -> RELENG_1. Is such a pull possible, for all lines in
> remotes file?

GIT-PULL(1)
DESCRIPTION
       Runs  git-fetch with the given parameters, and calls git-merge to merge the
       retrieved head(s) into the current branch.

Besides in remotes file you have only specified which remote branch
is tracked by which local branch. Additionally all but first are marked
as not-for-merge. There is no place for default branch to merge with.

There was some discussion about moving remotes information into config
file, including marking tracking branches as read-only, marking default
branch to merge (or marking branch as for-merge/not-for-merge), marking
branch as of not fast-forwarding type (like 'pu' in git.git) on the
_server_ side etc. But it petered out, unfortunately.

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git