From: "Miles Bader" <miles@gnu.org>
To: "Liu Yubao" <yubao.liu@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Do most people feel tracking branches useful?
Date: Wed, 29 Oct 2008 22:29:13 +0900 [thread overview]
Message-ID: <fc339e4a0810290629g57c6cec3idcbc4b1c1d5d0159@mail.gmail.com> (raw)
In-Reply-To: <490833AD.70806@gmail.com>
On Oct 29, 2008 6:58pm, Liu Yubao <yubao.liu@gmail.com> wrote:
> > Extremely useful. I usually keep local branches closely synchronized
> > with a remote "central" version, and tracking branches make the frequent
> > push/pull much more convenient.
>
> In my work flow, I don't keep changes in local branch for long time,
> I rebase it regularly and push them to central branch or discard them
> if the upstream rejects.
>
> You are right, I realize tracking branches is useful for people who keeps
> local changes for long time and track the upstream branch at the same
> time.
I don't keep local changes for a long time, I push daily. The local
tracking branch and the corresponding remote branch are basically copies of
each other, in different locations. I also do regularly rebasing, but
against a _different_ remote branch.
There are never merge commits, because all merges done by pull are
fast-forwards. If I were to push changes from multiple working directories
to the central location, I'd have to be more careful about the pull-merging
-- a rebase-on-pull as you suggest would be useful -- but I generally don't.
-Miles
--
Do not taunt Happy Fun Ball.
next prev parent reply other threads:[~2008-10-29 13:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-29 8:55 Do most people feel tracking branches useful? Liu Yubao
2008-10-29 9:08 ` Miles Bader
2008-10-29 9:58 ` Liu Yubao
2008-10-29 13:29 ` Miles Bader [this message]
2008-10-29 9:48 ` Andreas Ericsson
2008-10-29 10:22 ` Liu Yubao
2008-10-29 11:53 ` Andreas Ericsson
2008-10-29 10:03 ` Björn Steinbrink
2008-10-29 10:38 ` Liu Yubao
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=fc339e4a0810290629g57c6cec3idcbc4b1c1d5d0159@mail.gmail.com \
--to=miles@gnu.org \
--cc=git@vger.kernel.org \
--cc=yubao.liu@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).