From: Jeff King <peff@peff.net>
Date: Mon, 25 Aug 2008 21:03:51 GMT
Subject: Re: Has the git shell revert been done so master should work?
Message-ID: <20080825210351.GB28482@coredump.intra.peff.net>
In-Reply-To: <alpine.LNX.1.10.0808251325540.19079@suse104.zenez.com>

On Mon, Aug 25, 2008 at 01:30:23PM -0600, Boyd Lynn Gerber wrote:

> $ git clone git://git.kernel.org/pub/scm/git/git.git git
> $ cd git
> $ git checkout master
> Already on "master"
> $ git cherry-pick 4cfc24af
> fatal: exec merge-recursive failed.
> Automatic cherry-pick failed.  After resolving the conflicts,
> mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and  
> commit the result.
> When commiting, use the option '-c 4cfc24a' to retain authorship and  
> message.
>
> So I was attempting to do it right, but it just did not work.

Hmm. Something is broken if it was unable to run merge-recursive. You
could maybe try running with GIT_TRACE=1, or stracing cherry-pick to see
what was going on.

> BTW, is there a way to get all the messages sent since last night.  Some  
> how I lost my subscription to the git email list.  I re-subscribe at  
> around 1:30 MDT.  I really would like to get all the email I mised.

Gmane maintains an archive. You can either just read the messages via
the web, grab them via nntp, or you can even persuade them to send you
an mbox of a set of messages:

  http://gmane.org/export.php

-Peff