X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=wt-status.c;h=438a40d63739d9397829e83d7af241054f729235;hb=91fc159745eccb0830c9719642d07617c8100b41;hp=bf84a86ee3d6b136bd83115f0bf15a55835817fc;hpb=edc7f0abcbc42d05a5be1877ded9cc6eba5ec1b6;p=~andy%2Fgit

diff --git a/wt-status.c b/wt-status.c
index bf84a86ee..438a40d63 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -955,10 +955,12 @@ static void show_cherry_pick_in_progress(struct wt_status *s,
 	if (advice_status_hints) {
 		if (has_unmerged(s))
 			status_printf_ln(s, color,
-				_("  (fix conflicts and run \"git commit\")"));
+				_("  (fix conflicts and run \"git cherry-pick --continue\")"));
 		else
 			status_printf_ln(s, color,
-				_("  (all conflicts fixed: run \"git commit\")"));
+				_("  (all conflicts fixed: run \"git cherry-pick --continue\")"));
+		status_printf_ln(s, color,
+			_("  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"));
 	}
 	wt_status_print_trailer(s);
 }