diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-07-19 11:30:21 -0700 |
commit | d97c62c828d6f0eb7ba7067c8c24793620900dd8 (patch) | |
tree | 53941cdc41e6ad573859ee63c570499b869fc967 /cache.h | |
parent | Merge branch 'tb/ref-filter-multiple-patterns' (diff) | |
parent | cherry-pick/revert: advise using --skip (diff) | |
download | tgif-d97c62c828d6f0eb7ba7067c8c24793620900dd8.tar.xz |
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
Diffstat (limited to 'cache.h')
0 files changed, 0 insertions, 0 deletions