From: Johannes Sixt <j.sixt@viscovery.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Frank Li <lznuaa@gmail.com>,
Marius Storm-Olsen <mstormo@gmail.com>,
Reece Dunn <msclrhd@googlemail.com>,
git@vger.kernel.org, msysgit@googlegroups.com
Subject: Re: [msysGit] Re: [PATCH 02/11] Fix declare variable at mid of function
Date: Wed, 19 Aug 2009 12:55:38 +0200 [thread overview]
Message-ID: <4A8BDA2A.9030105@viscovery.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0908191158310.5594@intel-tinevez-2-302>
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.
-- Hannes
next prev parent reply other threads:[~2009-08-19 10:55 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-17 16:01 [PATCH 01/11] Fix build failure at VC because function declare use old style at regex.c Frank Li
2009-08-17 16:01 ` [PATCH 02/11] Fix declare variable at mid of function Frank Li
2009-08-17 16:01 ` [PATCH 03/11] Define SNPRINTF_SIZE_CORR 1 when use MSVC build git Frank Li
2009-08-17 16:01 ` [PATCH 04/11] Add _MSC_VER predefine macro to make same behaviors with __MINGW32__ Enable MSVC build. MSVC have the save behaviors with msysgit Frank Li
2009-08-17 16:38 ` Johannes Schindelin
2009-08-18 1:29 ` Frank Li
2009-08-18 5:06 ` tom fogal
2009-08-17 16:32 ` [PATCH 03/11] Define SNPRINTF_SIZE_CORR 1 when use MSVC build git Johannes Schindelin
2009-08-18 1:19 ` Frank Li
2009-08-18 9:31 ` Johannes Schindelin
2009-08-17 16:29 ` [PATCH 02/11] Fix declare variable at mid of function Johannes Schindelin
2009-08-17 16:34 ` Reece Dunn
2009-08-17 19:36 ` Johannes Schindelin
2009-08-18 5:23 ` [msysGit] " Marius Storm-Olsen
2009-08-18 9:34 ` Johannes Schindelin
2009-08-18 16:11 ` Frank Li
2009-08-18 16:52 ` Matthieu Moy
2009-08-19 10:15 ` Johannes Schindelin
2009-08-19 10:55 ` Johannes Sixt [this message]
2009-08-19 13:15 ` Johannes Schindelin
2009-08-19 15:21 ` [msysGit] " Johannes Sixt
2009-08-17 19:28 ` Junio C Hamano
2009-08-17 21:00 ` [msysGit] " Johannes Schindelin
2009-08-17 21:38 ` Junio C Hamano
2009-08-17 16:26 ` [PATCH 01/11] Fix build failure at VC because function declare use old style at regex.c Johannes Schindelin
2009-08-18 15:03 ` Frank Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A8BDA2A.9030105@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=lznuaa@gmail.com \
--cc=msclrhd@googlemail.com \
--cc=mstormo@gmail.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).