From: Mike Galbraith <efault@gmx•de>
To: Jeff King <peff@peff•net>
Cc: git <git@vger•kernel.org>
Subject: Re: git remote update -> rejected
Date: Tue, 22 Apr 2008 12:55:03 +0200 [thread overview]
Message-ID: <1208861703.18689.2.camel@marge.simson.net> (raw)
In-Reply-To: <20080422103458.GA14751@sigio.intra.peff.net>
On Tue, 2008-04-22 at 06:34 -0400, Jeff King wrote:
> On Tue, Apr 22, 2008 at 11:48:53AM +0200, Mike Galbraith wrote:
>
> > marge:..git/linux-2.6 # git remote update
> > Updating origin
> > Updating linux-next
> > Updating stable
> > Updating x86
> > >From git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
> > ! [rejected] latest -> x86/latest (non fast forward)
> > ! [rejected] master -> x86/master (non fast forward)
> > ! [rejected] testing -> x86/testing (non fast forward)
>
> The x86 tree was presumably rewound or rebased, which means that
> fetching their new position would overwrite your old. This is probably
> OK, since it looks like you have x86/* as tracking branches, and only
> they would get overwritten. So it is probably safe to put a '+' in front
> of the 'fetch' line in your config file. E.g.,
>
> [remote "x86"]
> url = ...
> fetch = +refs/heads/*:refs/remotes/x86/*
>
> See 'git help fetch' for details.
Thanks a bunch. I'll try it. I notice that origin and linux-next
already had + prefix. Presumably that came from the home repo.
-Mike
next prev parent reply other threads:[~2008-04-22 10:56 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-22 9:48 git remote update -> rejected Mike Galbraith
2008-04-22 10:34 ` Jeff King
2008-04-22 10:55 ` Mike Galbraith [this message]
2008-04-22 11:11 ` Jeff King
2008-04-22 11:58 ` Johannes Schindelin
2008-04-22 12:56 ` Jeff King
2008-04-22 13:03 ` Johannes Schindelin
2008-04-22 13:09 ` Jeff King
2008-04-22 13:26 ` [PATCH] builtin-remote: resurrect forced updates to tracked branches Johannes Schindelin
2008-04-22 17:00 ` git remote update -> rejected Junio C Hamano
2008-04-22 12:41 ` Teemu Likonen
2008-04-22 12:56 ` Johannes Schindelin
2008-04-22 13:01 ` Jeff King
2008-04-22 13:05 ` Johannes Schindelin
2008-04-22 13:53 ` Paolo Bonzini
2008-04-22 13:39 ` Teemu Likonen
2008-04-22 13:49 ` Johannes Schindelin
2008-04-22 14:04 ` Teemu Likonen
2008-04-22 14:10 ` Paolo Bonzini
2008-04-22 15:08 ` Johannes Schindelin
2008-04-22 15:26 ` Paolo Bonzini
2008-04-22 16:23 ` Paolo Bonzini
2008-04-22 16:42 ` Johannes Schindelin
2008-04-22 16:50 ` Junio C Hamano
2008-04-22 17:23 ` [PATCH] remote add: disallow --master and --mirror with non-bare repositories Johannes Schindelin
2008-04-22 18:45 ` Paolo Bonzini
2008-04-22 18:46 ` [PATCH] remote add: disallow --master and --mirror with non-bare repositories (review) Paolo Bonzini
2008-04-22 22:04 ` Johannes Schindelin
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=1208861703.18689.2.camel@marge.simson.net \
--to=efault@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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