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

From: Junio C Hamano <gitster@pobox.com>
Date: May 31, 2018, 23:15 UTC
Message-ID: <xmqqefhrct7h.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20180530160908.GA8340@D-10-19-29-76.dhcp4.washington.edu>

Taylor Blau <me@ttaylorr.com> writes:

Show 13 quoted lines

> I have these patches mostly updated on my copy (available at
> https://github.com/ttaylorr/git/compare/tb/grep-column) but am out of
> the office for the next week, so I will polish and send these on June
> 8th.
>
>> * tb/grep-only-matching (2018-05-14) 2 commits
>>  - builtin/grep.c: teach '-o', '--only-matching' to 'git-grep'
>>  - grep.c: extract show_line_header()
>>  (this branch uses tb/grep-column.)
>
> This topic is done, but will be frustrating to merge after the changes
> in tb/grep-column. I'll update this topic once tb/grep-column graduates
> to master, that way they will both apply cleanly.

Thanks for an update.