Re: git remote update -> rejected

From: Jeff King <peff@peff.net>
Date: Apr 22, 2008, 10:34 UTC
Message-ID: <20080422103458.GA14751@sigio.intra.peff.net>
In-Reply-To: <1208857733.4695.37.camel@marge.simson.net>

On Tue, Apr 22, 2008 at 11:48:53AM +0200, Mike Galbraith wrote:

Show 9 quoted lines

> 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.

-Peff