threads / patch / 41225

patchcompletion: Add --word-diff-regex= to diff

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

## tl;dr

3 messages between Jan 20, 2016 and Jan 22, 2016. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Thomas Braun· Jan 20, 2016, 17:34 UTC · lore

Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to contrib/completion/git-completion.bash +1 −2

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=

-- 
2.7.0.windows.1

Junio C Hamano· Jan 21, 2016, 00:18 UTC · re: Thomas Braun · lore

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

Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:

Show 20 quoted lines

> 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.

Thomas Braun· Jan 22, 2016, 20:39 UTC · re: Junio C Hamano · lore

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

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.