diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:04 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-07-10 13:59:04 -0700 |
commit | cf77911ae51b95bb6cd92216e6ff1a1afc60b3cc (patch) | |
tree | 33868362632c402ce6476afe0b857ab6b17b1c20 | |
parent | 8f3a16c390f428af64b8d34d587cc482b70f8666 (diff) | |
parent | 968b1fe263f9dfec65be4598e4f0dd76f1692551 (diff) | |
download | git-cf77911ae51b95bb6cd92216e6ff1a1afc60b3cc.tar.gz |
Merge branch 'mb/reword-autocomplete-message' into maint
Message update.
* mb/reword-autocomplete-message:
auto-correct: tweak phrasing
-rw-r--r-- | help.c | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -355,12 +355,18 @@ const char *help_unknown_cmd(const char *cmd) clean_cmdnames(&main_cmds); fprintf_ln(stderr, _("WARNING: You called a Git command named '%s', " - "which does not exist.\n" - "Continuing under the assumption that you meant '%s'"), - cmd, assumed); - if (autocorrect > 0) { - fprintf_ln(stderr, _("in %0.1f seconds automatically..."), - (float)autocorrect/10.0); + "which does not exist."), + cmd); + if (autocorrect < 0) + fprintf_ln(stderr, + _("Continuing under the assumption that " + "you meant '%s'."), + assumed); + else { + fprintf_ln(stderr, + _("Continuing in %0.1f seconds, " + "assuming that you meant '%s'."), + (float)autocorrect/10.0, assumed); sleep_millisec(autocorrect * 100); } return assumed; |