git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Has the git shell revert been done so master should work?

From
BGBoyd Lynn Gerber <gerberb@zenez.com>
Date
Aug 25, 2008, 19:30 UTC
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

Previous: Junio C HamanoNext: Jeff King
Message 8 of 10 in “Has the git shell revert been done so master should work?”
  1. Boyd Lynn GerberAug 24, 2008
  2. Jeff KingAug 24, 2008
  3. Boyd Lynn GerberAug 25, 2008
  4. Jeff KingAug 25, 2008
  5. Junio C HamanoAug 25, 2008
  6. Boyd Lynn GerberAug 26, 2008
  7. Junio C HamanoAug 25, 2008
  8. Boyd Lynn GerberAug 25, 2008
  9. Jeff KingAug 25, 2008
  10. Boyd Lynn GerberAug 26, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.