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

Re: 'Theirs' merge between branches on a binary file.

From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date
Dec 23, 2008, 18:31 UTC
Message-ID
<49512E9A.5040902@lsrfire.ath.cx>
In-Reply-To
<c115fd3c0812230605x369af9c0n372db761fa11ce39@mail.gmail.com>
Tim Visher schrieb:
> I'm now working on
> compiling git under cygwin as the latest version cygwin installs for
> you is 0.4!

Have you seen msysgit (http://code.google.com/p/msysgit/), the easy route to git on Windows? It has all you need to check out and compile the latest version of git.

René
Previous: Tim VisherNext: Tim Visher
Message 8 of 9 in “'Theirs' merge between branches on a binary file.”
  1. Tim VisherDec 22, 2008
  2. Junio C HamanoDec 22, 2008
  3. Tim VisherDec 22, 2008
  4. Junio C HamanoDec 22, 2008
  5. Tim VisherDec 22, 2008
  6. Junio C HamanoDec 22, 2008
  7. Tim VisherDec 23, 2008
  8. René ScharfeDec 23, 2008
  9. Tim VisherDec 28, 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.