From: Rajkumar S <rajkumars@gmail.com>
Date: Fri, 15 Sep 2006 11:59:38 GMT
Subject: Re: Tracking a branch using StGIT
Message-ID: <64de5c8b0609150459i2e678a02r86bb678ea420054f@mail.gmail.com>
In-Reply-To: <eee3i5$ib6$1@sea.gmane.org>

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?

In my case I am only interested in RELENG_1 branch, so would it be
fine if I just put the
"Pull: refs/heads/RELENG_1:refs/heads/RELENG_1" line in my remotes
file? Since I use StGIT I do not intend  to modify my local RELENG_1
branch except by StGIT patches, so all pulls from remote should be
fast forward merged. Thus if the stg pull can pull in the remote
RELENG_1 to local RELENG_1 with patched popped, and fastforward merge
it, it would be great.

raj