From: Junio C Hamano <gitster@pobox.com>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: [PATCH] Merge non-first refs that match first refspec
Date: Fri, 28 Sep 2007 14:23:45 -0700 [thread overview]
Message-ID: <7vps02o55q.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7vve9vp1zw.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 28 Sep 2007 02:34:27 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Daniel Barkalow <barkalow@iabervon.org> writes:
>
>> Beats me; Junio, what's your test case?
>
> I can paste tomorrow (it is a clone of git.git at work). I do
> not use .git/config but .git/remotes/origin and explicit four
> separate Pull: lines and going over http.
Here are the files. Note that I use traditional layout and
always have 'master' checked out when I initiate 'git pull'.
: xyzzy git.git/master; cat .git/config
[core]
logallrefupdates = true
[diff]
color = auto
[showbranch]
default = --topo-order
default = master
default = next
default = pu
[alias]
co = checkout
: xyzzy git.git/master; cat .git/remotes origin
URL: http://repo.or.cz/r/alt-git.git/
Pull: master:origin
Pull: next:next
Pull: +pu:pu
Pull: maint:maint
Pull: todo:todo
: xyzzy git.git/master; git pull
Warning: No merge candidate found because value of config option
"branch.master.merge" does not match any remote branch
fetched.
No changes.
: xyzzy git.git/master; git version
git version 1.5.3.2.1060.gaf79f
: xyzzy git.git/master; exit
next prev parent reply other threads:[~2007-09-28 21:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-28 3:52 [PATCH] Merge non-first refs that match first refspec Daniel Barkalow
2007-09-28 4:15 ` Shawn O. Pearce
2007-09-28 4:40 ` Daniel Barkalow
2007-09-28 4:48 ` Shawn O. Pearce
2007-09-28 5:12 ` Daniel Barkalow
2007-09-28 5:25 ` Shawn O. Pearce
2007-09-28 9:34 ` Junio C Hamano
2007-09-28 21:23 ` Junio C Hamano [this message]
2007-09-28 21:38 ` 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=7vps02o55q.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.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 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).