# [PATCH v2] difftool: fix word spacing in the usage strings 2 messages from 2021-09-21 to 2021-09-23. Participants: Bagas Sanjaya, Junio C Hamano. Thread: https://gitlist.dev/t/56555 ## Bagas Sanjaya, 2021-09-21 11:17 Subject: [PATCH v2] difftool: fix word spacing in the usage strings Message-ID: <20210921111712.894245-1-bagasdotme@gmail.com> URL: https://gitlist.dev/e/20210921111712.894245-1-bagasdotme%40gmail.com ``` Remove spaces in `non - zero` and add a space between the diff format/mode and option parentheses in difftool's usage strings. Signed-off-by: Bagas Sanjaya --- Changes since v1 [1]: - Touch up commit message to imperative tone (suggested by David Aguilar) Range-diff against v1 [1]: 1: d27159f7c9 ! 1: 18d5034c80 difftool: word spacing fix @@ Metadata Author: Bagas Sanjaya ## Commit message ## - difftool: word spacing fix + difftool: fix word spacing in the usage strings - Two grammar fixes related to word spacing: - - - delete space in `non - zero` - - add space between diff formats/mode and option parentheses + Remove spaces in `non - zero` and add a space between the diff + format/mode and option parentheses in difftool's usage strings. Signed-off-by: Bagas Sanjaya [1]: https://lore.kernel.org/git/c536bd3a-d1ae-a617-c284-dabc9f8c1c0f@gmail.com/T/#t builtin/difftool.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/difftool.c b/builtin/difftool.c index 6a9242a803..ad9187761e 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -410,9 +410,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, const char *src_path, *dst_path; if (starts_with(info.buf, "::")) - die(N_("combined diff formats('-c' and '--cc') are " + die(N_("combined diff formats ('-c' and '--cc') are " "not supported in\n" - "directory diff mode('-d' and '--dir-diff').")); + "directory diff mode ('-d' and '--dir-diff').")); if (parse_index_info(info.buf, &lmode, &rmode, &loid, &roid, &status)) @@ -713,7 +713,7 @@ int cmd_difftool(int argc, const char **argv, const char *prefix) "`--tool`")), OPT_BOOL(0, "trust-exit-code", &trust_exit_code, N_("make 'git-difftool' exit when an invoked diff " - "tool returns a non - zero exit code")), + "tool returns a non-zero exit code")), OPT_STRING('x', "extcmd", &extcmd, N_("command"), N_("specify a custom command for viewing diffs")), OPT_ARGUMENT("no-index", &no_index, N_("passed to `diff`")), base-commit: 4c719308ce59dc70e606f910f40801f2c6051b24 -- 2.25.1 ``` ## Junio C Hamano, 2021-09-23 00:10 Subject: Re: [PATCH v2] difftool: fix word spacing in the usage strings Message-ID: URL: https://gitlist.dev/e/xmqqk0j840ex.fsf%40gitster.g In-Reply-To: <20210921111712.894245-1-bagasdotme@gmail.com> ``` Bagas Sanjaya writes: > Remove spaces in `non - zero` and add a space between the diff > format/mode and option parentheses in difftool's usage strings. > > Signed-off-by: Bagas Sanjaya > --- > > Changes since v1 [1]: > - Touch up commit message to imperative tone (suggested by David > Aguilar) > > Range-diff against v1 [1]: > 1: d27159f7c9 ! 1: 18d5034c80 difftool: word spacing fix > @@ Metadata > Author: Bagas Sanjaya > > ## Commit message ## > - difftool: word spacing fix > + difftool: fix word spacing in the usage strings > > - Two grammar fixes related to word spacing: > - > - - delete space in `non - zero` > - - add space between diff formats/mode and option parentheses > + Remove spaces in `non - zero` and add a space between the diff > + format/mode and option parentheses in difftool's usage strings. OK. Will queue; thanks. ```