summaryrefslogtreecommitdiff
path: root/t/t6010-merge-base.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-11-22 19:27:21 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-22 18:16:59 -0800
commit539047c19ec040819b6f6af2d55714195b812abb (patch)
treed84dbed3909b0311fc9108dc5c96c87a51394288 /t/t6010-merge-base.sh
parentrevert: write REVERT_HEAD pseudoref during conflicted revert (diff)
downloadtgif-539047c19ec040819b6f6af2d55714195b812abb.tar.xz
revert: introduce --abort to cancel a failed cherry-pick
After running some ill-advised command like "git cherry-pick HEAD..linux-next", the bewildered novice may want to return to more familiar territory. Introduce a "git cherry-pick --abort" command that rolls back the entire cherry-pick sequence and places the repository back on solid ground. Just like "git merge --abort", this internally uses "git reset --merge", so local changes not involved in the conflict resolution are preserved. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6010-merge-base.sh')
0 files changed, 0 insertions, 0 deletions