]> granicus.if.org Git - git/commit
Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Mar 2019 03:10:40 +0000 (12:10 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Apr 2019 08:31:37 +0000 (17:31 +0900)
commit464c824a9b3daf49b1451746780c787279cbf79f
tree6049a035cfdbbfbc745d9ab3e203ce19f2556dcc
parente902e9bcae2010bc42648c80ab6adc6c5a16a4a5
parented35d18841130fee0109cbe40b659275a3f78cc9
Merge branch 'ag/sequencer-reduce-rewriting-todo' into pw/rebase-i-internal

* ag/sequencer-reduce-rewriting-todo:
  rebase--interactive: move transform_todo_file()
  sequencer: use edit_todo_list() in complete_action()
  rebase-interactive: rewrite edit_todo_list() to handle the initial edit
  rebase-interactive: append_todo_help() changes
  rebase-interactive: use todo_list_write_to_file() in edit_todo_list()
  sequencer: refactor skip_unnecessary_picks() to work on a todo_list
  rebase--interactive: move rearrange_squash_in_todo_file()
  rebase--interactive: move sequencer_add_exec_commands()
  sequencer: change complete_action() to use the refactored functions
  sequencer: make sequencer_make_script() write its script to a strbuf
  sequencer: refactor rearrange_squash() to work on a todo_list
  sequencer: refactor sequencer_add_exec_commands() to work on a todo_list
  sequencer: refactor check_todo_list() to work on a todo_list
  sequencer: introduce todo_list_write_to_file()
  sequencer: refactor transform_todos() to work on a todo_list
  sequencer: remove the 'arg' field from todo_item
  sequencer: make the todo_list structure public
  sequencer: changes in parse_insn_buffer()
builtin/rebase--interactive.c
sequencer.c
sequencer.h