Git development
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@mellanox.co.il>
To: git@vger.kernel.org
Subject: RFC: git pull <remote> making an octopus?
Date: Mon, 14 Aug 2006 09:43:36 +0300	[thread overview]
Message-ID: <20060814064336.GE21963@mellanox.co.il> (raw)

Hi!
If I do

$git pull origin

where origin is a file in .git/remotes/origin with multiple Pull: lines,
then I seem to get an octopus merge. I would expect it to behave
in the same way as git pull without parameters.
Is this a bug or a feature?

My git pull page says:
              While
              git-pull run without  any  explicit  <refspec>  parameter  takes
              default  <refspec>s  from  Pull: lines, it merges only the first
              <refspec> found into the current branch, after fetching all  the
              remote  refs. This is because making an Octopus from remote refs
              is rarely done, while keeping track of multiple remote heads  in
              one-go by fetching more than one is often useful.

So, the same logic seems to apply to anything under .git/remotes.
Right?

-- 
MST

             reply	other threads:[~2006-08-14  6:45 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-08-14  6:43 Michael S. Tsirkin [this message]
2006-08-14  7:00 ` RFC: git pull <remote> making an octopus? Junio C Hamano
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=20060814064336.GE21963@mellanox.co.il \
    --to=mst@mellanox.co.il \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox