From: Junio C Hamano <gitster@pobox•com>
To: Andrew Wong <andrew.kw.w@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH 1/3] wt-status: Make status messages more consistent with others
Date: Mon, 17 Mar 2014 14:51:42 -0700 [thread overview]
Message-ID: <xmqq1ty0cx3l.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1394771872-25940-2-git-send-email-andrew.kw.w@gmail.com> (Andrew Wong's message of "Fri, 14 Mar 2014 00:37:50 -0400")
Andrew Wong <andrew.kw.w@gmail•com> 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,
next prev parent reply other threads:[~2014-03-17 21:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-14 4:37 [PATCH 0/3] Make git more user-friendly during a merge conflict Andrew Wong
2014-03-14 4:37 ` [PATCH 1/3] wt-status: Make status messages more consistent with others Andrew Wong
2014-03-17 21:51 ` Junio C Hamano [this message]
2014-03-14 4:37 ` [PATCH 2/3] merge: Advise user to use "git merge --abort" to abort merges Andrew Wong
2014-03-17 21:58 ` Junio C Hamano
2014-03-14 4:37 ` [PATCH 3/3] reset: Print a warning when user uses "git reset" during a merge Andrew Wong
2014-03-14 14:33 ` Marc Branchaud
2014-03-14 17:04 ` Andrew Wong
2014-03-14 20:55 ` Junio C Hamano
2014-03-14 21:35 ` Andrew Wong
2014-03-15 19:23 ` Marc Branchaud
2014-03-17 21:54 ` Junio C Hamano
2014-03-17 23:04 ` [PATCH 0/3] Make git more user-friendly during a merge conflict Junio C Hamano
2014-03-17 23:25 ` Andrew Wong
2014-03-19 22:30 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq1ty0cx3l.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=andrew.kw.w@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox