* [PATCH] completion: Add --word-diff-regex= to diff
@ 2016-01-20 17:34 Thomas Braun
2016-01-21 0:18 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Thomas Braun @ 2016-01-20 17:34 UTC (permalink / raw
To: git; +Cc: Ramkumar Ramachandra, Junio C Hamano, John Keeping,
SZEDER Gábor
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=
--
2.7.0.windows.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] completion: Add --word-diff-regex= to diff
2016-01-20 17:34 [PATCH] completion: Add --word-diff-regex= to diff Thomas Braun
@ 2016-01-21 0:18 ` Junio C Hamano
2016-01-22 20:39 ` Thomas Braun
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2016-01-21 0:18 UTC (permalink / raw
To: Thomas Braun; +Cc: git, Ramkumar Ramachandra, John Keeping, SZEDER Gábor
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.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] completion: Add --word-diff-regex= to diff
2016-01-21 0:18 ` Junio C Hamano
@ 2016-01-22 20:39 ` Thomas Braun
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Braun @ 2016-01-22 20:39 UTC (permalink / raw
To: Junio C Hamano; +Cc: git, Ramkumar Ramachandra, John Keeping, SZEDER Gábor
Am 21.01.2016 um 01:18 schrieb Junio C Hamano:
> 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.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-01-22 20:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-20 17:34 [PATCH] completion: Add --word-diff-regex= to diff Thomas Braun
2016-01-21 0:18 ` Junio C Hamano
2016-01-22 20:39 ` Thomas Braun
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).