Re: What's cooking in git.git (Jun 2015, #05; Mon, 22)
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jun 24, 2015, 07:16 UTC
- Message-ID
- <ad998ee2d8387401a3ceb6a7df7457ab@www.dscho.org>
- In-Reply-To
- <xmqq616ecfuq.fsf@gitster.dls.corp.google.com>
Hi Junio,
On 2015-06-23 22:46, Junio C Hamano wrote:
Show 22 quoted lines
> Johannes Schindelin <johannes.schindelin@gmx.de> writes: > >> On 2015-06-23 00:49, Junio C Hamano wrote: >> >>> * js/rebase-i-clean-up-upon-continue-to-skip (2015-06-18) 3 commits >>> - rebase -i: do not leave a CHERRY_PICK_HEAD file behind >>> - SQUASH: test_must_fail is a shell function >>> - t3404: demonstrate CHERRY_PICK_HEAD bug >>> >>> Abandoning an already applied change in "git rebase -i" with >>> "--continue" left CHERRY_PICK_HEAD and confused later steps. >>> >>> Expecting a reroll. >>> ($gmane/271856) >> >> Actually, there had been two re-rolls, and v3 seemed to be okay: >> $gmane/272037. It also looks as if 726a35ebd^..726a35ebd^2 is >> identical with v3... Anything you want me to change in addition? > > Thanks for a pointer; I think I updated the topic and then forgot to > update the reference in "whats cooking". I'll take a look at 272037 > and if I have anything further will comment there.
Thanks.
Show 11 quoted lines
>> Also: >> >>> * js/fsck-opt (2015-06-22) 19 commits >>> [...] >>> > > [...] > > If the for-layout is the only thing that is questionable thing to > fix in what I queued, I think I can locally fix-up without an extra > roundtrip.
It is the only thing (and not even questionable ;-)).
Thanks! Dscho