tree eec56549e6d2e5593981ec2540b77f4a46e80309
parent 6cfa633565cc16f77d6e6d56fa608680828105a1
parent 460bc3ce7386582b3259f8e3a2c1ace443ddb1ae
author Junio C Hamano <gitster@pobox.com> 1557759034 +0900
committer Junio C Hamano <gitster@pobox.com> 1557759034 +0900

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