git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Feb 2010, #02; Sun, 07)
Date: Mon, 08 Feb 2010 09:29:01 +0100	[thread overview]
Message-ID: <4B6FCB4D.6070602@viscovery.net> (raw)
In-Reply-To: <7vhbpswju3.fsf@alter.siamese.dyndns.org>

Junio C Hamano schrieb:
> * sp/maint-push-sideband (2010-02-05) 6 commits
>  - receive-pack: Send hook output over side band #2
>  - receive-pack: Wrap status reports inside side-band-64k
>  - receive-pack: Refactor how capabilities are shown to the client
>  - send-pack: demultiplex a sideband stream with status data
>  - run-command: support custom fd-set in async
>  - run-command: Allow stderr to be a caller supplied pipe
>  (this branch is used by sp/push-sideband.)
> 
> Based on 1.6.5 maintenance track
> 
> * sp/push-sideband (2010-02-05) 0 commits
>  (this branch uses sp/maint-push-sideband.)
> 
> And my conflict resolution in #ifdef WINDOWS codepath (meaning: untested,
> please check).

The resolution is correct. I'm using this branch in my private build on
Windows; so far it works as expected.

-- Hannes

      reply	other threads:[~2010-02-08  8:31 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-08  2:19 What's cooking in git.git (Feb 2010, #02; Sun, 07) Junio C Hamano
2010-02-08  8:29 ` Johannes Sixt [this message]

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=4B6FCB4D.6070602@viscovery.net \
    --to=j.sixt@viscovery.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).