diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:58 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-06-04 10:20:59 +0900 |
commit | 0501b7e78564d11e87d228f7ffdbdb4b147145e3 (patch) | |
tree | dd388bb6e4b8ca0bb876fe0ceec01379d492d0fc /help.c | |
parent | Merge branch 'bw/submodule-with-bs-path' into maint (diff) | |
parent | git-filter-branch: be more direct in an error message (diff) | |
download | tgif-0501b7e78564d11e87d228f7ffdbdb4b147145e3.tar.xz |
Merge branch 'ja/do-not-ask-needless-questions' into maint
Git sometimes gives an advice in a rhetorical question that does
not require an answer, which can confuse new users and non native
speakers. Attempt to rephrase them.
* ja/do-not-ask-needless-questions:
git-filter-branch: be more direct in an error message
read-tree -m: make error message for merging 0 trees less smart aleck
usability: don't ask questions if no reply is required
Diffstat (limited to 'help.c')
-rw-r--r-- | help.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -411,8 +411,8 @@ const char *help_unknown_cmd(const char *cmd) if (SIMILAR_ENOUGH(best_similarity)) { fprintf_ln(stderr, - Q_("\nDid you mean this?", - "\nDid you mean one of these?", + Q_("\nThe most similar command is", + "\nThe most similar commands are", n)); for (i = 0; i < n; i++) |