Re: [PATCH v2 00/12] nd/icase updates
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jul 1, 2016, 19:40 UTC
- Message-ID
- <xmqqk2h5xi3q.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <xmqqvb0pxjfi.fsf@gitster.mtv.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 9 quoted lines
> Duy Nguyen <pclouds@gmail.com> writes: > >> The rest looks good (after your comment fixup). I see you already have >> all the changes in your SQUASH??? commit. Do you want me to resend or >> you will just squash this in locally? > > Squashing in would need to redo this into a few relevant commits, > so it won't be "just squash this in locally" I am afraid, but let me > try.
Ok, there was a miniscule conflicts but otherwise the squashed material was all coming from a single step in the original, so I did so myself. Let's start merging the result to 'next' ;-)
Thanks.