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)
"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

1  2 
Documentation/config/advice.txt
Documentation/git-revert.txt
advice.c
advice.h
builtin/commit.c
builtin/revert.c
sequencer.c
sequencer.h
Simple merge
Simple merge
diff --cc advice.c
Simple merge
diff --cc advice.h
Simple merge
Simple merge
Simple merge
diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge