strbuf: use _rtrim and _ltrim in strbuf_trim

diff --git a/builtin/commit.c b/builtin/commit.c
index 215b5bec192777b36953c76fa8b15c5b14a8a643..9cfef6c6cca61973a4982763e4b834bf1b45cb75 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1128,7 +1128,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
        if (argc == 0 && only && amend)
                only_include_assumed = _("Clever... amending the last one with dirty index.");
        if (argc > 0 && !also && !only)
-               only_include_assumed = _("Explicit paths specified without -i nor -o; assuming --only paths...");
+               only_include_assumed = _("Explicit paths specified without -i or -o; assuming --only paths...");
        if (!cleanup_arg || !strcmp(cleanup_arg, "default"))
                cleanup_mode = use_editor ? CLEANUP_ALL : CLEANUP_SPACE;
        else if (!strcmp(cleanup_arg, "verbatim"))