Hi, On Wed, 19 Aug 2009, Johannes Sixt wrote: > Johannes Schindelin schrieb: > > On Wed, 19 Aug 2009, Frank Li wrote: > >> I have push my change to tgit > >> git://repo.or.cz/tgit.git > >> branch vcpatch2 > >> > >> How do I know if patch has been applied main line? > > > > I applied them to 4msysgit.git's devel. Note that I had a strange > > merge conflict in pager.c: you replaced and #ifndef __MINGW32__ with > > an #ifndef WIN32, but I don't have that #ifndef at all. > > 4msysgit has my "Windows: Better support PAGER settings with spaces in > the path", which removes the #ifndefs, Frank's version doesn't have it. > Therefore, you should not rebase Frank's patches on top of 4msysgit's > master or devel before they are merged into git.git. Well, I wanted to give them a little bit more visibility by putting them into 4msysgit.git, as I think the best way to get Microsoft Visual C++ support into git.git _is_ via 4msysgit.git. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html