From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: pull/push inconsistencies
Date: Wed, 16 May 2007 01:21:16 +0200 [thread overview]
Message-ID: <f2df9a$so6$1@sea.gmane.org> (raw)
In-Reply-To: 46a038f90705151553h553ae9d3kc3d43af72f385a42@mail.gmail.com
Martin Langhoff wrote:
> When tracking several branches from a repo, git-pull does a fetch (of
> all the remote heads) and merges _only the tracking branch currently
> checked out_. That's ok. However, if I checkout another tracking
> branch and issue git-pull, the merge does not happen because git-fetch
> finds nothing new on the remote side. git-pull should merge anyway if
> remotes/origin/<trackinghead> is ahead of the local head.
>
> The workaround is to call git-merge explicitly, but git-pull is
> misleading the user saying "nothing to merge" instead of completing
> the merge.
Strange. This would be regression, but in my experience "git pull" _always_
merges, even if there is nothing to fetch. But I don't have branch to merge
configured...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-05-15 23:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-15 22:53 pull/push inconsistencies Martin Langhoff
2007-05-15 23:21 ` Jakub Narebski [this message]
2007-05-16 0:24 ` Junio C Hamano
2007-05-16 1:11 ` Martin Langhoff
2007-05-16 1:22 ` Junio C Hamano
2007-05-16 1:40 ` J. Bruce Fields
2007-05-16 1:51 ` Martin Langhoff
2007-05-16 2:30 ` Junio C Hamano
2007-05-16 22:35 ` Martin Langhoff
2007-05-16 12:02 ` Jeff King
2007-05-16 2:50 ` [PATCH] " Daniel Barkalow
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='f2df9a$so6$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.