| commit | b95e66f507967fdfbf7275a94729fe09aa4b20ca | |
| author | Ralf Thielow <ralf.thielow@gmail.com> | |
| Mon, 17 Jun 2013 04:28:26 +0000 (17 06:28 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 20:16:26 +0000 (17 13:16 -0700) | ||
| tree | 401a13d7f547489aeb3e88fce96d797d0e06d5c0 | treesnapshot (tar.gz zip) |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 | commitdiff |
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>
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>
| t/t7512-status-help.sh | diffblobblamehistory | |
| wt-status.c | diffblobblamehistory |