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

diff --cc Documentation/config/advice.txt
Simple merge

diff --cc Documentation/git-revert.txt
Simple merge

diff --cc advice.c
Simple merge

diff --cc advice.h
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/revert.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc sequencer.h
Simple merge