]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
sequencer: rename reset_for_rollback to reset_merge
authorRohit Ashiwal <rohit.ashiwal265@gmail.com>
Tue, 2 Jul 2019 09:11:26 +0000 (14:41 +0530)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2019 19:08:07 +0000 (12:08 -0700)
commit918d1e6ed89738afad63a5cfc92668ac77a7be95
tree2dfc35640f3ec34df2ac5f822822f9f435a08876
parent6a1f9046a40ad69eb00e5a83c6825972113f6e0f
sequencer: rename reset_for_rollback to reset_merge

We are on a path to teach cherry-pick/revert how to skip commits. To
achieve this, we could really make use of existing functions.
reset_for_rollback is one such function, but the name does not
intuitively suggest to use it to reset a merge, which it was born to
perform, see 539047c ("revert: introduce --abort to cancel a failed
cherry-pick", 2011-11-23). Change the name to reset_merge to make
it more intuitive.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c