Eric Wong writes:
> The following changes since commit cf4c2cfe52be5bd973a4838f73a35d3959ce2f43:
>
> Second batch of topics for 2.10 (2016-06-27 10:07:08 -0700)
>
> are available in the git repository at:
>
> git://bogomips.org/git-svn.git master
>
> for you to fetch changes up to 2af7da9f8fb
Johannes Schindelin writes:
> What about the am-call-merge-recursive-directly patch series? As I
> demonstrated by rebasing it to `pu`, it is actually not butchering the
> smudge/clean pathway as you suggested.
What I said was it seemed to conflict with something else, which
butchered that codep
Hi Junio,
On Fri, 8 Jul 2016, Junio C Hamano wrote:
> * js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit
> - am: counteract gender bias
>
> One part of "git am" had an oddball helper function that called
> stuff from outside "his" as opposed to calling what we have "ours",
> w
On Sun, Jul 10, 2016 at 03:47:36AM +, Eric Wong wrote:
> > There was one minor improvement I suggested[1] (and which you seemed to
> > like), which is to push the errno check into the function. That wasn't
> > expressed in patch form, though, so I've included below a version of
> > your patch
Jeff King wrote:
> On Sat, Jul 09, 2016 at 11:45:18PM +, Eric Wong wrote:
> > Junio C Hamano wrote:
> > > * sb/submodule-parallel-fetch (2016-06-27) 2 commits
> > > (merged to 'next' on 2016-07-06 at de5fd35)
> > > + xwrite: poll on non-blocking FDs
> > > + xread: retry after poll on EAGA
On Sat, Jul 09, 2016 at 11:45:18PM +, Eric Wong wrote:
> Junio C Hamano wrote:
> > * sb/submodule-parallel-fetch (2016-06-27) 2 commits
> > (merged to 'next' on 2016-07-06 at de5fd35)
> > + xwrite: poll on non-blocking FDs
> > + xread: retry after poll on EAGAIN/EWOULDBLOCK
> >
> > Fix
Junio C Hamano wrote:
> * sb/submodule-parallel-fetch (2016-06-27) 2 commits
> (merged to 'next' on 2016-07-06 at de5fd35)
> + xwrite: poll on non-blocking FDs
> + xread: retry after poll on EAGAIN/EWOULDBLOCK
>
> Fix a recently introduced codepaths that are involved in parallel
> submodule
Junio C Hamano wrote:
> * ew/svn-bad-ref (2016-07-06) 1 commit
> - git-svn: warn instead of dying when commit data is missing
> I'm likely to discard this, favouring a direct pull request from
> the subsystem maintainer directly going to 'master'.
Pushed with your sign-off added, along with C
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The first few batches for this cyc
9 matches
Mail list logo
