From: "Rajkumar S" <rajkumars@gmail.com>
To: "Jakub Narebski" <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Tracking a branch using StGIT
Date: Fri, 15 Sep 2006 17:29:38 +0530 [thread overview]
Message-ID: <64de5c8b0609150459i2e678a02r86bb678ea420054f@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2006-09-15 11:59 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-15 8:20 Tracking a branch using StGIT Rajkumar S
2006-09-15 10:42 ` Catalin Marinas
2006-09-15 10:58 ` Andy Whitcroft
2006-09-15 11:17 ` Santi
2006-09-15 11:34 ` Rajkumar S
2006-09-15 11:32 ` Rajkumar S
2006-09-15 11:42 ` Jakub Narebski
2006-09-15 11:59 ` Rajkumar S [this message]
2006-09-15 12:09 ` Jakub Narebski
2006-09-15 12:18 ` Rajkumar S
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=64de5c8b0609150459i2e678a02r86bb678ea420054f@mail.gmail.com \
--to=rajkumars@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).