Re: [PATCH] completion: Add --word-diff-regex= to diff

From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Date: Jan 22, 2016, 20:39 UTC
Message-ID: <56A29372.4050500@virtuell-zuhause.de>
In-Reply-To: <xmqqy4bj23a3.fsf@gitster.mtv.corp.google.com>

Am 21.01.2016 um 01:18 schrieb Junio C Hamano:

Show 25 quoted lines

> Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:
> 
>> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
>> ---
>>  contrib/completion/git-completion.bash | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/contrib/completion/git-completion.bash
>> b/contrib/completion/git-completion.bash
>> index ab4da7f..d2a08dd 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -1169,7 +1169,7 @@ __git_diff_common_options="--stat --numstat
>> --shortstat --summary
>>  			--no-prefix --src-prefix= --dst-prefix=
>>  			--inter-hunk-context=
>>  			--patience --histogram --minimal
>> -			--raw --word-diff
>> +			--raw --word-diff --word-diff-regex=
>>  			--dirstat --dirstat= --dirstat-by-file
>>  			--dirstat-by-file= --cumulative
>>  			--diff-algorithm=
> 
> Thanks; the patch was word-wrapped, but I fixed it up and managed to
> apply.

Thanks for applying Junio, and sorry that you had to clean up my sloppyness.