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 -- 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