diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 12:41:48 -0700 |
| commit | 4b9a0deddcc643e5082739e7649ab745faf9e7fc (patch) | |
| tree | ac9a40608c64d557781b130b52b786d21dadb61d /wt-status.c | |
| parent | 66929c423a83ceb9a81e0a298102bfd155a1689b (diff) | |
| parent | 8ceb6fbd63e2b3b82bbca0139a1696955aa753c6 (diff) | |
Merge branch 'kb/am-deprecate-resolved'
Promote "git am --continue" over "git am --resolved" for UI
consistency.
* kb/am-deprecate-resolved:
am: replace uses of --resolved with --continue
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, |