From: Boyd Lynn Gerber <gerberb@zenez.com>
Date: Mon, 25 Aug 2008 19:30:23 GMT
Subject: Re: Has the git shell revert been done so master should work?
Message-ID: <alpine.LNX.1.10.0808251325540.19079@suse104.zenez.com>
In-Reply-To: <alpine.LNX.1.10.0808240659350.16122@xenau.zenez.com>

I was doing it correctly, but this is what I am seeing.

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

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.

Thanks,

--
Boyd Gerber <gerberb@zenez.com>
ZENEZ	1042 East Fort Union #135, Midvale Utah  84047