diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-05-13 17:50:34 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-05-13 17:50:34 +0300 |
commit | 7ba06bc3d026cee54437db5cfddfffe7b4d7a187 (patch) | |
tree | eec56549e6d2e5593981ec2540b77f4a46e80309 /parse-options.h | |
parent | 6cfa633565cc16f77d6e6d56fa608680828105a1 (diff) | |
parent | 460bc3ce7386582b3259f8e3a2c1ace443ddb1ae (diff) |
Merge branch 'pw/rebase-i-internal'
The internal implementation of "git rebase -i" has been updated to
avoid forking a separate "rebase--interactive" process.
* pw/rebase-i-internal:
rebase -i: run without forking rebase--interactive
rebase: use a common action enum
rebase -i: use struct rebase_options in do_interactive_rebase()
rebase -i: use struct rebase_options to parse args
rebase -i: use struct object_id for squash_onto
rebase -i: use struct commit when parsing options
rebase -i: remove duplication
rebase -i: combine rebase--interactive.c with rebase.c
rebase: use OPT_RERERE_AUTOUPDATE()
rebase: rename write_basic_state()
rebase: don't translate trace strings
sequencer: always discard index after checkout
Diffstat (limited to 'parse-options.h')
-rw-r--r-- | parse-options.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/parse-options.h b/parse-options.h index 1dd3523c15..bd00cf0049 100644 --- a/parse-options.h +++ b/parse-options.h @@ -277,8 +277,12 @@ int parse_opt_abbrev_cb(const struct option *, const char *, int); int parse_opt_expiry_date_cb(const struct option *, const char *, int); int parse_opt_color_flag_cb(const struct option *, const char *, int); int parse_opt_verbosity_cb(const struct option *, const char *, int); +/* value is struct oid_array* */ int parse_opt_object_name(const struct option *, const char *, int); +/* value is struct object_id* */ +int parse_opt_object_id(const struct option *, const char *, int); int parse_opt_commits(const struct option *, const char *, int); +int parse_opt_commit(const struct option *, const char *, int); int parse_opt_tertiary(const struct option *, const char *, int); int parse_opt_string_list(const struct option *, const char *, int); int parse_opt_noop_cb(const struct option *, const char *, int); |