From: "Jon Smirl" <jonsmirl@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Git Mailing List" <git@vger.kernel.org>,
"Catalin Marinas" <catalin.marinas@gmail.com>
Subject: Re: non-monotonic index error
Date: Tue, 2 Sep 2008 17:01:38 -0400 [thread overview]
Message-ID: <9e4733910809021401s217706d0h7a313bbd66670ad9@mail.gmail.com> (raw)
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
prev parent reply other threads:[~2008-09-02 21:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-02 19:57 non-monotonic index error Jon Smirl
2008-09-02 20:28 ` Nicolas Pitre
2008-09-02 21:37 ` Jon Smirl
2008-09-02 23:04 ` Nicolas Pitre
2008-09-02 23:48 ` Jon Smirl
2008-09-02 20:53 ` Junio C Hamano
2008-09-02 21:01 ` Jon Smirl [this message]
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=9e4733910809021401s217706d0h7a313bbd66670ad9@mail.gmail.com \
--to=jonsmirl@gmail.com \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).