From: Miklos Vajna <vmiklos@frugalware.org>
To: Thomas Rast <trast@student.ethz.ch>
Cc: "Shawn O. Pearce" <spearce@spearce.org>,
"Michael P. Soulier" <msoulier@digitaltorque.ca>,
git@vger.kernel.org
Subject: Re: having to pull twice
Date: Fri, 26 Sep 2008 01:25:25 +0200 [thread overview]
Message-ID: <20080925232525.GP23137@genesis.frugalware.org> (raw)
In-Reply-To: <200809250905.09646.trast@student.ethz.ch>
[-- Attachment #1: Type: text/plain, Size: 466 bytes --]
On Thu, Sep 25, 2008 at 09:05:02AM +0200, Thomas Rast <trast@student.ethz.ch> wrote:
> On the other hand, as near as I can tell this is a regression in
> builtin-merge. Miklos, do you know if/how this can be fixed?
I think Junio already fixed this in 446247d (merge: fix numerus bugs
around "trivial merge" area, 2008-08-23), so 1.6.0.1 or 1.6.0.2 should
not have this bug.
Michael, could you please upgrade frm 1.6.0 and confirm your problem
goes away?
Thanks.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next prev parent reply other threads:[~2008-09-25 23:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 0:58 having to pull twice Michael P. Soulier
2008-09-25 1:01 ` Shawn O. Pearce
2008-09-25 7:05 ` Thomas Rast
2008-09-25 18:49 ` Alex Riesen
2008-09-25 21:28 ` Michael P. Soulier
2008-09-25 23:25 ` Miklos Vajna [this message]
2008-09-27 14:16 ` Thomas Rast
2008-09-28 15:11 ` Miklos Vajna
2008-09-28 15:26 ` Thomas Rast
2008-09-29 15:00 ` Miklos Vajna
2008-10-03 13:02 ` [PATCH] builtin-merge: refresh the index before calling a strategy Miklos Vajna
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080925232525.GP23137@genesis.frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=msoulier@digitaltorque.ca \
--cc=spearce@spearce.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).