diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:57 -0700 |
| commit | 001d1160541a6dcfceb82a0a900478e315a129eb (patch) | |
| tree | bf35a1f9ac9be44976dd4e97d4450f98daceb286 | |
| parent | Merge branch 'nk/config-local-doc' (diff) | |
| parent | wt-status: give better advice when cherry-pick is in progress (diff) | |
| download | tgif-001d1160541a6dcfceb82a0a900478e315a129eb.tar.xz | |
Merge branch 'rt/cherry-pick-continue-advice-in-status'
* rt/cherry-pick-continue-advice-in-status:
wt-status: give better advice when cherry-pick is in progress
| -rwxr-xr-x | t/t7512-status-help.sh | 6 | ||||
| -rw-r--r-- | wt-status.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index bf08d4e098..4f09beca90 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -632,7 +632,8 @@ test_expect_success 'status when cherry-picking before resolving conflicts' ' cat >expected <<-\EOF && # On branch cherry_branch # You are currently cherry-picking. - # (fix conflicts and run "git commit") + # (fix conflicts and run "git cherry-pick --continue") + # (use "git cherry-pick --abort" to cancel the cherry-pick operation) # # Unmerged paths: # (use "git add <file>..." to mark resolution) @@ -655,7 +656,8 @@ test_expect_success 'status when cherry-picking after resolving conflicts' ' cat >expected <<-\EOF && # On branch cherry_branch # You are currently cherry-picking. - # (all conflicts fixed: run "git commit") + # (all conflicts fixed: run "git cherry-pick --continue") + # (use "git cherry-pick --abort" to cancel the cherry-pick operation) # # Changes to be committed: # diff --git a/wt-status.c b/wt-status.c index bf84a86ee3..438a40d637 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); } |