# [PATCH] completion: Add --word-diff-regex= to diff 3 messages from 2016-01-20 to 2016-01-22. Participants: Thomas Braun, Junio C Hamano. Thread: https://gitlist.dev/t/41225 ## Thomas Braun, 2016-01-20 17:34 Subject: [PATCH] completion: Add --word-diff-regex= to diff Message-ID: <569FC542.2060504@virtuell-zuhause.de> URL: https://gitlist.dev/e/569FC542.2060504%40virtuell-zuhause.de ``` Signed-off-by: Thomas Braun --- 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 ``` ## Junio C Hamano, 2016-01-21 00:18 Subject: Re: [PATCH] completion: Add --word-diff-regex= to diff Message-ID: URL: https://gitlist.dev/e/xmqqy4bj23a3.fsf%40gitster.mtv.corp.google.com In-Reply-To: <569FC542.2060504@virtuell-zuhause.de> ``` Thomas Braun writes: > Signed-off-by: Thomas Braun > --- > 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, 2016-01-22 20:39 Subject: Re: [PATCH] completion: Add --word-diff-regex= to diff Message-ID: <56A29372.4050500@virtuell-zuhause.de> URL: https://gitlist.dev/e/56A29372.4050500%40virtuell-zuhause.de In-Reply-To: ``` Am 21.01.2016 um 01:18 schrieb Junio C Hamano: > Thomas Braun writes: > >> Signed-off-by: Thomas Braun >> --- >> 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. ```