{"thread":{"id":"41225","subject":"[PATCH] completion: Add --word-diff-regex= to diff","startedAt":"2016-01-20T17:34:58Z","lastAt":"2016-01-22T20:39:14Z","messageCount":3,"participants":["Thomas Braun","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"276442","messageId":"569FC542.2060504@virtuell-zuhause.de","threadId":"41225","inReplyTo":null,"subject":"[PATCH] completion: Add --word-diff-regex= to diff","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2016-01-20T17:34:58Z","receivedAt":"2016-01-20T17:34:58Z","isPatch":true,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>\n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash\nb/contrib/completion/git-completion.bash\nindex ab4da7f..d2a08dd 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1169,7 +1169,7 @@ __git_diff_common_options=\"--stat --numstat\n--shortstat --summary\n \t\t\t--no-prefix --src-prefix= --dst-prefix=\n \t\t\t--inter-hunk-context=\n \t\t\t--patience --histogram --minimal\n-\t\t\t--raw --word-diff\n+\t\t\t--raw --word-diff --word-diff-regex=\n \t\t\t--dirstat --dirstat= --dirstat-by-file\n \t\t\t--dirstat-by-file= --cumulative\n \t\t\t--diff-algorithm=\n-- \n2.7.0.windows.1\n"},{"id":"276476","messageId":"xmqqy4bj23a3.fsf@gitster.mtv.corp.google.com","threadId":"41225","inReplyTo":"569FC542.2060504@virtuell-zuhause.de","subject":"Re: [PATCH] completion: Add --word-diff-regex= to diff","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2016-01-21T00:18:44Z","receivedAt":"2016-01-21T00:18:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:\n\n> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>\n> ---\n>  contrib/completion/git-completion.bash | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/contrib/completion/git-completion.bash\n> b/contrib/completion/git-completion.bash\n> index ab4da7f..d2a08dd 100644\n> --- a/contrib/completion/git-completion.bash\n> +++ b/contrib/completion/git-completion.bash\n> @@ -1169,7 +1169,7 @@ __git_diff_common_options=\"--stat --numstat\n> --shortstat --summary\n>  \t\t\t--no-prefix --src-prefix= --dst-prefix=\n>  \t\t\t--inter-hunk-context=\n>  \t\t\t--patience --histogram --minimal\n> -\t\t\t--raw --word-diff\n> +\t\t\t--raw --word-diff --word-diff-regex=\n>  \t\t\t--dirstat --dirstat= --dirstat-by-file\n>  \t\t\t--dirstat-by-file= --cumulative\n>  \t\t\t--diff-algorithm=\n\nThanks; the patch was word-wrapped, but I fixed it up and managed to\napply.\n"},{"id":"276574","messageId":"56A29372.4050500@virtuell-zuhause.de","threadId":"41225","inReplyTo":"xmqqy4bj23a3.fsf@gitster.mtv.corp.google.com","subject":"Re: [PATCH] completion: Add --word-diff-regex= to diff","fromName":"Thomas Braun","fromEmail":"thomas.braun@virtuell-zuhause.de","sentAt":"2016-01-22T20:39:14Z","receivedAt":"2016-01-22T20:39:14Z","isPatch":true,"sender":{"key":"thomas.braun@virtuell-zuhause.de","avatar":"https://avatars.githubusercontent.com/u/1185677?v=4"},"body":"Am 21.01.2016 um 01:18 schrieb Junio C Hamano:\n> Thomas Braun <thomas.braun@virtuell-zuhause.de> writes:\n> \n>> Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>\n>> ---\n>>  contrib/completion/git-completion.bash | 2 +-\n>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/contrib/completion/git-completion.bash\n>> b/contrib/completion/git-completion.bash\n>> index ab4da7f..d2a08dd 100644\n>> --- a/contrib/completion/git-completion.bash\n>> +++ b/contrib/completion/git-completion.bash\n>> @@ -1169,7 +1169,7 @@ __git_diff_common_options=\"--stat --numstat\n>> --shortstat --summary\n>>  \t\t\t--no-prefix --src-prefix= --dst-prefix=\n>>  \t\t\t--inter-hunk-context=\n>>  \t\t\t--patience --histogram --minimal\n>> -\t\t\t--raw --word-diff\n>> +\t\t\t--raw --word-diff --word-diff-regex=\n>>  \t\t\t--dirstat --dirstat= --dirstat-by-file\n>>  \t\t\t--dirstat-by-file= --cumulative\n>>  \t\t\t--diff-algorithm=\n> \n> Thanks; the patch was word-wrapped, but I fixed it up and managed to\n> apply.\n\nThanks for applying Junio, and sorry that you had to clean up my sloppyness.\n"}]}