Merge branch 'dl/rebase-i-keep-base'

diff --git a/wt-status.c b/wt-status.c
index 9f6c65a5809754717f8c51f809eae78f435bcd12..ad6282c7f86884aab0722457844ed391dbe71059 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -1433,6 +1433,8 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
                else
                        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)"));
        }
@@ -1460,6 +1462,8 @@ static void show_revert_in_progress(struct wt_status *s,
                else
                        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)"));
        }