summaryrefslogtreecommitdiff
path: root/merge-file.h
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-11-22 11:14:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-11-22 21:30:35 (GMT)
commitf80a87262aa4468b0941d38deffdb97a757307c5 (patch)
tree07857c78b1f77a8c6eff2a786fb2386e43873021 /merge-file.h
parent0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (diff)
downloadgit-f80a87262aa4468b0941d38deffdb97a757307c5.zip
git-f80a87262aa4468b0941d38deffdb97a757307c5.tar.gz
git-f80a87262aa4468b0941d38deffdb97a757307c5.tar.bz2
revert: rename --reset option to --quit
The option to "git cherry-pick" and "git revert" to discard the sequencer state introduced by v1.7.8-rc0~141^2~6 (revert: Introduce --reset to remove sequencer state, 2011-08-04) has a confusing name. Change it now, while we still have the time. The new name for "cherry-pick, please get out of my way, since I've long forgotten about the sequence of commits I was cherry-picking when you wrote that old .git/sequencer directory" is --quit. Mnemonic: this is analagous to quiting a program the user is no longer using --- we just want to get out of the multiple-command cherry-pick procedure and not to reset HEAD or rewind any other old state. The "--reset" option is kept as a synonym to minimize the impact. We might consider dropping it for simplicity in a separate patch, though. Adjust documentation and tests to use the newly preferred name (--quit) instead of --reset. While at it, let's clarify the short descriptions of these operations in "-h" output. Before: --reset forget the current operation --continue continue the current operation After: --quit end revert or cherry-pick sequence --continue resume revert or cherry-pick sequence Noticed-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-file.h')
0 files changed, 0 insertions, 0 deletions