diff options
| author | Kevin Bracey <kevin@bracey.fi> | 2013-06-26 23:06:41 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-27 09:37:12 -0700 |
| commit | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (patch) | |
| tree | eac0b847a1a57ec6faec225feed4fd76452d0685 /wt-status.c | |
| parent | 85318f521f6c0b9843d6da12abf67f2de7608431 (diff) | |
| download | git-8ceb6fbd63e2b3b82bbca0139a1696955aa753c6.tar.gz | |
am: replace uses of --resolved with --continue
git am was previously modified to provide --continue for consistency
with rebase, merge etc, and the documentation changed to showing
--continue as the primary form.
Complete the work by replacing remaining uses of --resolved by
--continue, most notably in suggested command reminders.
Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 438a40d637..b191c65382 100644 --- a/wt-status.c +++ b/wt-status.c @@ -826,7 +826,7 @@ static void show_am_in_progress(struct wt_status *s, if (advice_status_hints) { if (!state->am_empty_patch) status_printf_ln(s, color, - _(" (fix conflicts and then run \"git am --resolved\")")); + _(" (fix conflicts and then run \"git am --continue\")")); status_printf_ln(s, color, _(" (use \"git am --skip\" to skip this patch)")); status_printf_ln(s, color, |