From: Jeff King <peff@peff.net>
To: Eugene Sajine <euguess@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@student.ethz.ch>,
git@vger.kernel.org
Subject: Re: origin/branchname and tracking branch pointing to different commits?
Date: Tue, 8 Jun 2010 14:30:07 -0400 [thread overview]
Message-ID: <20100608183007.GA31293@coredump.intra.peff.net> (raw)
In-Reply-To: <AANLkTinLVd483-ki6tVb545PgpOFeOLYLR_GiKM5xAl7@mail.gmail.com>
On Tue, Jun 08, 2010 at 12:27:14PM -0400, Eugene Sajine wrote:
> I'm coming back to this topic as i see some confusion growing about
> such behavior. Every now and then users come across this problem and
> they expect pull to *really* behave as fetch and merge so it will
> cause the update of remote/branchname branch. And it is kind of
> difficult to justify why they have to do git fetch after pull...
>
> Can somebody, please, take a look?
This was discussed a while back:
http://thread.gmane.org/gmane.comp.version-control.git/127163
and I even posted a patch, but never followed up (I think mostly just
due to being busy).. There is some concern about unexpected ref updates,
though.
-Peff
next prev parent reply other threads:[~2010-06-08 18:30 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-07 17:03 origin/branchname and tracking branch pointing to different commits? Eugene Sajine
2010-01-07 17:06 ` Matthieu Moy
2010-01-07 17:12 ` Thomas Rast
2010-01-07 17:25 ` Eugene Sajine
2010-01-07 23:50 ` Eugene Sajine
2010-01-08 0:32 ` Junio C Hamano
2010-06-08 16:27 ` Eugene Sajine
2010-06-08 17:25 ` Junio C Hamano
2010-06-08 17:50 ` Eugene Sajine
2010-06-08 18:30 ` Jeff King [this message]
2010-06-28 17:43 ` Eugene Sajine
2010-06-29 19:27 ` Junio C Hamano
2010-06-29 20:05 ` Eugene Sajine
2010-06-29 22:39 ` Jeff King
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=20100608183007.GA31293@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=euguess@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/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).