Merge branch 'ra/cherry-pick-revert-skip'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:21 +0000 (11:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Jul 2019 18:30:21 +0000 (11:30 -0700)
commitd97c62c828d6f0eb7ba7067c8c24793620900dd8
tree53941cdc41e6ad573859ee63c570499b869fc967
parentb4b8c35729985a8f1f5e22f82259a2499efbc37a
parentdcb500dc16ce8db556b51e9a5b3fa977111d0443
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
Documentation/config/advice.txt
Documentation/git-revert.txt
advice.c
advice.h
builtin/commit.c
builtin/revert.c
sequencer.c
sequencer.h