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/t4300-merge-tree.sh | |
parent | Git 1.8.3 (diff) | |
download | tgif-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/t4300-merge-tree.sh')
0 files changed, 0 insertions, 0 deletions