Git Extensions: Win32 error 487: Couldn’t reserve space for cygwin’s heap, Win32 error 0

I had the same problem. I found solution here http://jakob.engbloms.se/archives/1403 c:\msysgit\bin>rebase.exe -b 0x50000000 msys-1.0.dll For me solution was slightly different. It was C:\Program Files (x86)\Git\bin>rebase.exe -b 0x50000000 msys-1.0.dll Before you rebase dlls, you should make sure it is not in use: tasklist /m msys-1.0.dll And make a backup: copy msys-1.0.dll msys-1.0.dll.bak If the rebase command … Read more

Git on Windows: How do you set up a mergetool?

To follow-up on Charles Bailey’s answer, here’s my git setup that’s using p4merge (free cross-platform 3way merge tool); tested on msys Git (Windows) install: git config –global merge.tool p4merge git config –global mergetool.p4merge.cmd ‘p4merge.exe \”$BASE\” \”$LOCAL\” \”$REMOTE\” \”$MERGED\”‘ or, from a windows cmd.exe shell, the second line becomes : git config –global mergetool.p4merge.cmd “p4merge.exe \”$BASE\” … Read more

Git under windows: MSYS or Cygwin?

Edit (2 more years later: October 2014) Johannes Schindelin just explained (Oct. 2014) that msysgit is phased out: we now have a light-weight Git for Windows SDK – which is essentially a standard MinGW/MSys system managed through the package manager mingw-get. We decided to just phase out the name “msysGit” (as well as the GitHub … Read more

SSL certificate rejected trying to access GitHub over HTTPS behind firewall

The problem is that you do not have any of Certification Authority certificates installed on your system. And these certs cannot be installed with cygwin’s setup.exe. Update: Install Net/ca-certificates package in cygwin (thanks dirkjot) There are two solutions: Actually install root certificates. Curl guys extracted for you certificates from Mozilla. cacert.pem file is what you … Read more

Difference between msysgit and Cygwin + git?

Edit 2018: Since my 2010-2012-2014 answer, in 2015 Git for Windows uses msys2, as I detail here. See more in “How are msys, msys2, and msysgit related to each other?”. Edit (2 more years later: October 2014) Johannes Schindelin just explained (Oct. 2014) that msysgit is phased out: We now have a light-weight Git for … Read more