This is mainly changing messages that say:
run "git foo --bar"
to
use "git foo --bar" to baz
Although the commands and flags are usually self-explanatory, this is
more consistent with other status messages, and gives some sort of
explanation to the user.
Signed-off-by: Andrew Wong <andrew.k...@gmail.com>
---
wt-status.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
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);
}
@@ -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,
@@ -994,7 +994,7 @@ static void show_rebase_in_progress(struct wt_status *s,
_("You are currently rebasing."));
if (s->hints) {
status_printf_ln(s, color,
- _(" (fix conflicts and then run \"git rebase
--continue\")"));
+ _(" (fix conflicts and then use \"git rebase
--continue\" to continue)"));
status_printf_ln(s, color,
_(" (use \"git rebase --skip\" to skip this
patch)"));
status_printf_ln(s, color,
@@ -1011,7 +1011,7 @@ static void show_rebase_in_progress(struct wt_status *s,
_("You are currently rebasing."));
if (s->hints)
status_printf_ln(s, color,
- _(" (all conflicts fixed: run \"git rebase
--continue\")"));
+ _(" (all conflicts fixed: use \"git rebase
--continue\" to continue)"));
} else if (split_commit_in_progress(s)) {
if (state->branch)
status_printf_ln(s, color,
@@ -1023,7 +1023,7 @@ static void show_rebase_in_progress(struct wt_status *s,
_("You are currently splitting a
commit during a rebase."));
if (s->hints)
status_printf_ln(s, color,
- _(" (Once your working directory is clean, run
\"git rebase --continue\")"));
+ _(" (Once your working directory is clean, use
\"git rebase --continue\" to continue)"));
} else {
if (state->branch)
status_printf_ln(s, color,
@@ -1052,10 +1052,10 @@ static void show_cherry_pick_in_progress(struct
wt_status *s,
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
- _(" (fix conflicts and run \"git cherry-pick
--continue\")"));
+ _(" (fix conflicts and use \"git cherry-pick
--continue\" to continue)"));
else
status_printf_ln(s, color,
- _(" (all conflicts fixed: run \"git
cherry-pick --continue\")"));
+ _(" (all conflicts fixed: use \"git
cherry-pick --continue\" to continue)"));
status_printf_ln(s, color,
_(" (use \"git cherry-pick --abort\" to cancel the
cherry-pick operation)"));
}
@@ -1071,10 +1071,10 @@ static void show_revert_in_progress(struct wt_status *s,
if (s->hints) {
if (has_unmerged(s))
status_printf_ln(s, color,
- _(" (fix conflicts and run \"git revert
--continue\")"));
+ _(" (fix conflicts and use \"git revert
--continue\" to continue)"));
else
status_printf_ln(s, color,
- _(" (all conflicts fixed: run \"git revert
--continue\")"));
+ _(" (all conflicts fixed: use \"git revert
--continue\" to continue)"));
status_printf_ln(s, color,
_(" (use \"git revert --abort\" to cancel the revert
operation)"));
}
--
1.9.0.174.g6f75b8f
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
