diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-08-27 00:45:41 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-27 14:47:09 -0700 |
| commit | 86ae43da6a6edbe7fbd9226ef316b894aef9da21 (patch) | |
| tree | 69bd54b6833335edc27108087f2aebb4bd77c816 /wt-status.c | |
| parent | b1b16bba966b919c0ddb57338c5745ea8b288eb5 (diff) | |
| download | git-86ae43da6a6edbe7fbd9226ef316b894aef9da21.tar.gz | |
status: mention --skip for revert and cherry-pick
When reverting or cherry-picking, one of the options we can pass the
sequencer is `--skip`. However, unlike rebasing, `--skip` is not
mentioned as a possible option in the status message. Mention it so that
users are more aware of their options.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c index 9f6c65a580..ad6282c7f8 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1434,6 +1434,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s, status_printf_ln(s, color, _(" (all conflicts fixed: run \"git cherry-pick --continue\")")); status_printf_ln(s, color, + _(" (use \"git cherry-pick --skip\" to skip this patch)")); + status_printf_ln(s, color, _(" (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)")); } wt_longstatus_print_trailer(s); @@ -1461,6 +1463,8 @@ static void show_revert_in_progress(struct wt_status *s, status_printf_ln(s, color, _(" (all conflicts fixed: run \"git revert --continue\")")); status_printf_ln(s, color, + _(" (use \"git revert --skip\" to skip this patch)")); + status_printf_ln(s, color, _(" (use \"git revert --abort\" to cancel the revert operation)")); } wt_longstatus_print_trailer(s); |