All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jon Loeliger <jdl@freescale.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Miles Bader <miles@gnu.org>, Git List <git@vger.kernel.org>
Subject: Re: "git pull REMOTE" question
Date: Wed, 22 Aug 2007 11:44:23 -0500	[thread overview]
Message-ID: <1187801063.15321.4.camel@ld0161-tx32> (raw)
In-Reply-To: <7vtzqsjgq2.fsf@gitster.siamese.dyndns.org>

On Wed, 2007-08-22 at 00:11, Junio C Hamano wrote:

> So, how about extending the syntax for [branch $current_branch]
> section of the config like this?
> 
>  ;; traditional -- when on "master", use '[remote "origin"] url'
>  ;; and '[remote "origin"] fetch' to decide where to fetch from,
>  ;; and merge their refs/heads/master to our branch.
>  [branch "master"]
>  	remote = origin
>         merge = refs/heads/master
> 
>  ;; new -- when on "master', and the user says to pull from "usb"
>  ;; without saying which branch to merge, use '[remote "usb"] url'
>  ;; and '[remote "usb"] fetch' to decide where to fetch from,
>  ;; and merge their refs/heads/xprm to our branch.
>  [branch "master:usb"]
>  	merge = refs/heads/xprm
> 
> The trick in the new syntax is that you cannot have a colon in
> refname, so there is no way for existing [branch $name] section
> to crash with the new style definition.

Wasn't there was a brief alternate notion to add a "for <remote>"
clause and allowing something like this?:

    [branch "master"]
        merge = refs/heads/xprm for usb
        merge = refs/heads/stuff for otherremote

Thanks,
jdl

  reply	other threads:[~2007-08-22 16:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-22  4:23 "git pull REMOTE" question Miles Bader
2007-08-22  4:35 ` Junio C Hamano
2007-08-22  4:44   ` Miles Bader
2007-08-22  5:11     ` Junio C Hamano
2007-08-22 16:44       ` Jon Loeliger [this message]
2007-08-22 20:29         ` Junio C Hamano

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=1187801063.15321.4.camel@ld0161-tx32 \
    --to=jdl@freescale.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=miles@gnu.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.