diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2019-08-27 00:45:36 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-27 14:47:08 -0700 |
| commit | deaa65a7545f2970167e32db3ff5f91b392f0517 (patch) | |
| tree | 7c4f7668b87d88b95f99508b7c17a27df65e63be /xdiff/xprepare.h | |
| parent | First batch after Git 2.23 (diff) | |
| download | tgif-deaa65a7545f2970167e32db3ff5f91b392f0517.tar.xz | |
completion: merge options for cherry-pick and revert
Since revert and cherry-pick share the same sequencer code, they should
both accept the same command-line options. Derive the
`__git_cherry_pick_inprogress_options` and
`__git_revert_inprogress_options` variables from
`__git_sequencer_inprogress_options` so that the options aren't
unnecessarily duplicated twice.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xprepare.h')
0 files changed, 0 insertions, 0 deletions