Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-06 Thread Junio C Hamano
Elijah Newren writes: > Hi Junio, > > On Sun, Apr 29, 2018 at 8:25 PM, Junio C Hamano wrote: >> * en/rename-directory-detection-reboot (2018-04-25) 36 commits > >> >> Reboot of an attempt to detect wholesale directory renames and use >> it while merging. >> >> Will merge to 'next'. > > Usual

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-04 Thread Elijah Newren
Hi Junio, On Sun, Apr 29, 2018 at 8:25 PM, Junio C Hamano wrote: > * en/rename-directory-detection-reboot (2018-04-25) 36 commits > > Reboot of an attempt to detect wholesale directory renames and use > it while merging. > > Will merge to 'next'. Usually you have a mini-release-note in your

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-02 Thread Brandon Williams
On 04/30, Junio C Hamano wrote: > * bw/protocol-v2 (2018-03-15) 35 commits > (merged to 'next' on 2018-04-11 at 23ee234a2c) > + remote-curl: don't request v2 when pushing > + remote-curl: implement stateless-connect command > + http: eliminate "# service" line when using protocol v2 > + http:

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-02 Thread Junio C Hamano
Johannes Schindelin writes: >> As I wrote elsewhere, for a low-impact and ralatively old issue like >> this, it is OK for a fix to use supporting code that only exists in >> more recent codebase and become unmergeable to anything older than >> the concurrent 'maint' track as of the time when the

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-01 Thread Johannes Schindelin
Hi Junio, On Wed, 2 May 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > So the problem you found is not a problem with *my* branch, of course, as > > I did not fork off of ... > > Correct; there is no blame on you with the choice of the base. It > was my mistake that I didn't

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-01 Thread Junio C Hamano
Johannes Schindelin writes: > So the problem you found is not a problem with *my* branch, of course, as > I did not fork off of ... Correct; there is no blame on you with the choice of the base. It was my mistake that I didn't check if the series could be queueable on the maintenance track that

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-01 Thread Junio C Hamano
SZEDER Gábor writes: > On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano wrote: >> * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits >> - rebase --skip: clean up commit message after a failed fixup/squash >> - sequencer: always commit without editing when asked for >> - reb

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-05-01 Thread Johannes Schindelin
Hi, On Mon, 30 Apr 2018, SZEDER Gábor wrote: > On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano wrote: > > * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits > > - rebase --skip: clean up commit message after a failed fixup/squash > > - sequencer: always commit without editin

Re: What's cooking in git.git (Apr 2018, #04; Mon, 30)

2018-04-30 Thread SZEDER Gábor
On Mon, Apr 30, 2018 at 5:25 AM, Junio C Hamano wrote: > * js/rebase-i-clean-msg-after-fixup-continue (2018-04-30) 4 commits > - rebase --skip: clean up commit message after a failed fixup/squash > - sequencer: always commit without editing when asked for > - rebase -i: Handle "combination o