summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <chriscool@tuxfamily.org>2010-06-02 07:58:38 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-02 10:09:56 -0700
commit7e2bfd3f99f8d6e89c7b855675919dd5404e47a2 (patch)
treed462af0e31a5ffc87eb4c5f2a2d9206da14a5e23 /resolve-undo.c
parentrevert: change help_msg() to take no argument (diff)
downloadtgif-7e2bfd3f99f8d6e89c7b855675919dd5404e47a2.tar.xz
revert: allow cherry-picking more than one commit
This makes it possible to pass many commits or ranges of commits to "git cherry-pick" and to "git revert" to process many commits instead of just one. In fact commits are now enumerated with an equivalent of git rev-list --no-walk "$@" so all the following are now possible: git cherry-pick master~2..master git cherry-pick ^master~2 master git cherry-pick master^ master The following should be possible but does not work: git cherry-pick -2 master because "git rev-list --no-walk -2 master" only outputs one commit as "--no-walk" seems to take over "-2". And there is currently no way to continue cherry-picking or reverting if there is a problem with one commit. It's also not possible to abort the whole process. Some future work should provide the --continue and --abort options to do just that. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
0 files changed, 0 insertions, 0 deletions