From: Junio C Hamano <junkio@cox.net>
To: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: git@vger.kernel.org
Subject: Re: RFC: git pull <remote> making an octopus?
Date: Mon, 14 Aug 2006 00:00:38 -0700 [thread overview]
Message-ID: <7vac67g5t5.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20060814064336.GE21963@mellanox.co.il> (Michael S. Tsirkin's message of "Mon, 14 Aug 2006 09:43:36 +0300")
"Michael S. Tsirkin" <mst@mellanox.co.il> writes:
> $ git pull origin
>
> where origin is a file in .git/remotes/origin with multiple Pull: lines,
> then I seem to get an octopus merge.
You shouldn't.
I have four Pull: lines like these for .git/remotes/ko
URL: kernel.org:/pub/scm/git/git.git/
Pull: master:refs/tags/ko-master
Pull: next:refs/tags/ko-next
Pull: +pu:refs/tags/ko-pu
Pull: maint:refs/tags/ko-maint
Push: heads/master
Push: heads/next
Push: +heads/pu
Push: heads/maint
and "git pull ko" leaves this in .git/FETCH_HEAD:
460c... branch 'master' of .kernel.org:/pub/scm/git/git
767f... not-for-merge branch 'next' of .kernel.org:/pub/scm/git/git
9bd4... not-for-merge branch 'pu' of .kernel.org:/pub/scm/git/git
9a1a... not-for-merge branch 'maint' of .kernel.org:/pub/scm/git/git
The latter three are not merged into the current branch with the
above pull command.
Are you by any chance running a version of git that has some
unofficial patches that affect the generation of not-for-merge
markers?
next prev parent reply other threads:[~2006-08-14 7:00 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-14 6:43 RFC: git pull <remote> making an octopus? Michael S. Tsirkin
2006-08-14 7:00 ` Junio C Hamano [this message]
2006-08-14 7:53 ` Michael S. Tsirkin
2006-08-14 17:55 ` Michael S. Tsirkin
2006-08-14 21:45 ` Junio C Hamano
2006-08-15 7:40 ` Alex Riesen
2006-08-15 7:45 ` Junio C Hamano
2006-08-17 9:08 ` Junio C Hamano
2006-08-17 9:18 ` Alex Riesen
2006-08-17 9:46 ` Michael S. Tsirkin
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=7vac67g5t5.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=mst@mellanox.co.il \
/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