Re: Rationale for the "Never commit to the right side of a Pull line" rule

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Luben Tuikov
Date: Friday, October 27, 2006 - 1:56 am

--- Jerome Lovy <t2a2e9z8ncbs9qg@brefemail.com> wrote:

Yes, you are missing the obvious and yes it is explained.
Read the 2nd "Note" for the documentation of "git-fetch":

http://www.kernel.org/pub/software/scm/git/docs/git-fetch.html

Quoted here for convenience:

[NOTE]
You never do your own development on branches that appear
on the right hand side of a <refspec> colon on `Pull:` lines;
they are to be updated by `git-fetch`.  If you intend to do
development derived from a remote branch `B`, have a `Pull:`
line to track it (i.e. `Pull: B:remote-B`), and have a separate
branch `my-B` to do your development on top of it.  The latter
is created by `git branch my-B remote-B` (or its equivalent `git
checkout -b my-B remote-B`).  Run `git fetch` to keep track of
the progress of the remote side, and when you see something new
on the remote branch, merge it into your development branch with
`git pull . remote-B`, while you are on `my-B` branch.
The common `Pull: master:origin` mapping of a remote `master`
branch to a local `origin` branch, which is then merged to a
local development branch, again typically named `master`, is made
when you run `git clone` for you to follow this pattern.

  Luben


Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: Rationale for the "Never commit to the right side of a ..., Luben Tuikov, (Fri Oct 27, 1:56 am)