diff options
| author | Ralf Thielow <ralf.thielow@gmail.com> | 2013-06-17 06:28:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-17 13:16:26 -0700 |
| commit | b95e66f507967fdfbf7275a94729fe09aa4b20ca (patch) | |
| tree | 401a13d7f547489aeb3e88fce96d797d0e06d5c0 /t/t7512-status-help.sh | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-b95e66f507967fdfbf7275a94729fe09aa4b20ca.tar.gz git-b95e66f507967fdfbf7275a94729fe09aa4b20ca.tar.xz | |
wt-status: give better advice when cherry-pick is in progress
When cherry-pick is in progress, 'git status' gives the advice to
run "git commit" to finish the cherry-pick.
However, this won't continue the sequencer, when picking a range of
commits.
Advise users to run "git cherry-pick --continue/--abort"; they work
when picking a single commit as well.
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7512-status-help.sh')
| -rwxr-xr-x | t/t7512-status-help.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index bf08d4e09..4f09beca9 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: # |