From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:21 +0000 (-0700)
Subject: Merge branch 'ra/cherry-pick-revert-skip'
X-Git-Tag: v2.23.0-rc0~35
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d97c62c828d6f0eb7ba7067c8c24793620900dd8

Merge branch 'ra/cherry-pick-revert-skip'

"git cherry-pick/revert" learned a new "--skip" action.

* ra/cherry-pick-revert-skip:
cherry-pick/revert: advise using --skip
cherry-pick/revert: add --skip option
sequencer: use argv_array in reset_merge
sequencer: rename reset_for_rollback to reset_merge
sequencer: add advice for revert
---

d97c62c828d6f0eb7ba7067c8c24793620900dd8