Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-27 Thread Stefan Beller
On Wed, Jan 27, 2016 at 12:46 AM, Lars Schneider wrote: > > On 26 Jan 2016, at 23:58, Junio C Hamano wrote: > >> Lars Schneider writes: >> >>> Hi Junio, >>> >>> Did you miss the topic "submodule: extend die message on failed >>> checkout with depth argument" or do you not agree with it >>> ($gma

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-27 Thread Lars Schneider
On 26 Jan 2016, at 23:58, Junio C Hamano wrote: > Lars Schneider writes: > >> Hi Junio, >> >> Did you miss the topic "submodule: extend die message on failed >> checkout with depth argument" or do you not agree with it >> ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666 >> a

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-26 Thread Junio C Hamano
Lars Schneider writes: > Hi Junio, > > Did you miss the topic "submodule: extend die message on failed > checkout with depth argument" or do you not agree with it > ($gmane/282779)? Stefan Beller reviewed the commits ($gmane/283666 > and $gmane/283851). No, these three are still in my inbox. Qu

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-26 Thread Lars Schneider
On 21 Jan 2016, at 00:33, Junio C Hamano wrote: > 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 st

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-22 Thread Junio C Hamano
Johannes Schindelin writes: > On Wed, 20 Jan 2016, Junio C Hamano wrote: > >> * bb/merge-marker-crlf (2015-11-24) 1 commit >> - merge-file: consider core.crlf when writing merge markers >> >> Write out merge markers using system end-of-line convention. >> >> Waiting for a re-roll to handle g

Re: What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-22 Thread Johannes Schindelin
Hi Junio, On Wed, 20 Jan 2016, Junio C Hamano wrote: > * bb/merge-marker-crlf (2015-11-24) 1 commit > - merge-file: consider core.crlf when writing merge markers > > Write out merge markers using system end-of-line convention. > > Waiting for a re-roll to handle gitattributes. > ($gmane/281

jc/rerere-multi (was: What's cooking in git.git (Jan 2016, #04; Wed, 20))

2016-01-21 Thread Johannes Sixt
Am 21.01.2016 um 00:33 schrieb Junio C Hamano: > * jc/rerere-multi (2015-09-14) 7 commits > - rerere: do use multiple variants > - t4200: rerere a merge with two identical conflicts > - rerere: allow multiple variants to exist > - rerere: delay the recording of preimage > - rerere: handle

What's cooking in git.git (Jan 2016, #04; Wed, 20)

2016-01-20 Thread Junio C Hamano
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 tip of 'master' now has second