Andrew Wong <andrew.kw.w@xxxxxxxxx> writes:
> This is mainly changing messages that say:
> run "git foo --bar"
> to
> use "git foo --bar" to baz
"git foo --bar" is fine, but "to baz" was hard to read without first
realizing that 'baz' stands for some/any verb. I think rephrasing
it to
use "git foo --bar" to do baz
would reduce confusion.
> diff --git a/wt-status.c b/wt-status.c
> index a452407..9f2358a 100644
> --- a/wt-status.c
> +++ b/wt-status.c
> @@ -899,13 +899,13 @@ static void show_merge_in_progress(struct wt_status *s,
> status_printf_ln(s, color, _("You have unmerged paths."));
> if (s->hints)
> status_printf_ln(s, color,
> - _(" (fix conflicts and run \"git commit\")"));
> + _(" (fix conflicts and use \"git commit\" to conclude the merge)"));
> } else {
> status_printf_ln(s, color,
> _("All conflicts fixed but you are still merging."));
> if (s->hints)
> status_printf_ln(s, color,
> - _(" (use \"git commit\" to conclude merge)"));
> + _(" (use \"git commit\" to conclude the merge)"));
> }
> wt_status_print_trailer(s);
> }
The above hunk makes sense.
At first glance, I felt that none of the remainder made much sense.
My reaction was: "git foo --continue" to continue? What else could
the --continue option even mean?
The real value I see in these conversions is by saying "use this to
continue" instead of an unconditional "run this", it implies "*IF*
you wanted to continue, you can do this", meaning that user also has
the option of *not* continuing. But the proposed update falls short
of realizing the full potential, if that is the value we are trying
to add. I'd say
fix conflicts and then use "git am --continue" if you want
to continue.
or an even more explicit
fix conflicts and then use "git am --continue" if you want
to continue; or you can "git am --abort" to discontinue.
would be an improvement, but
fix conflicts and then use "git am --continue" to continue
is probably not quite.
> @@ -922,7 +922,7 @@ static void show_am_in_progress(struct wt_status *s,
> if (s->hints) {
> if (!state->am_empty_patch)
> status_printf_ln(s, color,
> - _(" (fix conflicts and then run \"git am --continue\")"));
> + _(" (fix conflicts and then use \"git am --continue\" to continue)"));
> status_printf_ln(s, color,
> _(" (use \"git am --skip\" to skip this patch)"));
> status_printf_ln(s, color,
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html