From: Jon Smirl <jonsmirl@gmail.com>
Date: Tue, 02 Sep 2008 21:01:38 GMT
Subject: Re: non-monotonic index error
Message-ID: <9e4733910809021401s217706d0h7a313bbd66670ad9@mail.gmail.com>
In-Reply-To: <7vbpz6jmmf.fsf@gitster.siamese.dyndns.org>

On 9/2/08, Junio C Hamano <gitster@pobox.com> wrote:
> "Jon Smirl" <jonsmirl@gmail.com> writes:
>
>  > I pulled from linus, did stg rebase linus/master, git push digispeaker
>  > and got these errors.
>  >
>  > Where's the problem, at my local machine or the digispeaker one? How
>  > do I fix this?
>  >
>  > jonsmirl@terra:~/fs$ stg --version
>  > Stacked GIT 0.14.3.195.g36a0
>  > git version 1.5.6.GIT
>  > Python version 2.5.2 (r252:60911, Jul 31 2008, 17:31:22)
>  > [GCC 4.2.3 (Ubuntu 4.2.3-2ubuntu7)]
>  > jonsmirl@terra:~/fs$
>  >
>  > [digispeaker]$ git --version
>  > git version 1.4.4.4
>
>
> It is a bit fishy that stg reports 1.5.6.GIT; does it come with its own
>  copy of git which is newer than what you have?
>

Two different machines - terra and digispeaker



-- 
Jon Smirl
jonsmirl@gmail.com