summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-11-22 05:20:46 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-22 18:18:02 -0800
commitc427b211b3f5d3f967e5fc7abd526b02f83a7246 (patch)
tree04d657ad603bfa1310a4b6cca20639e34e3b9e74 /t/t1000-read-tree-m-3way.sh
parentrevert: introduce --abort to cancel a failed cherry-pick (diff)
downloadtgif-c427b211b3f5d3f967e5fc7abd526b02f83a7246.tar.xz
revert: remove --reset compatibility option
Remove the "git cherry-pick --reset" option, which has a different preferred spelling nowadays ("--quit"). Luckily the old --reset name was not around long enough for anyone to get used to it. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions