From: Alex Riesen <raa.lkml@gmail.com>
To: David Woodhouse <dwmw2@infradead.org>
Cc: git@vger.kernel.org
Subject: Re: 'upstream' branches.
Date: Sat, 5 May 2007 19:44:16 +0200 [thread overview]
Message-ID: <20070505174416.GA2898@steel.home> (raw)
In-Reply-To: <1178368166.11851.60.camel@pmac.infradead.org>
David Woodhouse, Sat, May 05, 2007 14:29:26 +0200:
> [remote "origin"]
> url = ssh://git.infradead.org/~/public_git/foo-2.6.git
> fetch = +refs/heads/*:refs/remotes/origin/*
> fetch = +refs/heads/mtd:refs/heads/mtd
> fetch = +refs/heads/linus:refs/heads/linus
These pluses request overwriting of the local reference even if it has
more commits than the remote ("is newer"). Are you sure you want that?
> What I have at the moment isn't ideal because I think pulling from the
> 'mtd' tree will fail if the 'linus' branch there is older than the local
> clone's 'linus' branch. But it mostly works.
>
> Is there a better way?
I would just remove the pluses. git-fetch will say that the branch is
already up-to-date, if the local branch already has everything the
remote has.
next prev parent reply other threads:[~2007-05-05 17:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-05 12:29 'upstream' branches David Woodhouse
2007-05-05 17:44 ` Alex Riesen [this message]
2007-05-05 17:50 ` David Woodhouse
2007-05-05 22:52 ` Alex Riesen
2007-05-06 6:36 ` Junio C Hamano
2007-05-06 7:35 ` David Woodhouse
2007-05-06 8:00 ` Junio C Hamano
2007-05-06 8:39 ` David Woodhouse
2007-05-07 1:20 ` Junio C Hamano
2007-05-07 8:51 ` David Woodhouse
2007-05-06 9:21 ` Alex Riesen
2007-05-07 7:40 ` Junio C Hamano
2007-05-07 8:39 ` Alex Riesen
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=20070505174416.GA2898@steel.home \
--to=raa.lkml@gmail.com \
--cc=dwmw2@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).