]> granicus.if.org Git - git/commitdiff
Merge branch 'ag/sequencer-todo-updates' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:22 +0000 (13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 24 Oct 2019 04:34:22 +0000 (13:34 +0900)
Reduce unnecessary reading of state variables back from the disk
during sequener operation.

* ag/sequencer-todo-updates:
  sequencer: directly call pick_commits() from complete_action()
  rebase: fill `squash_onto' in get_replay_opts()
  sequencer: move the code writing total_nr on the disk to a new function
  sequencer: update `done_nr' when skipping commands in a todo list
  sequencer: update `total_nr' when adding an item to a todo list

1  2 
sequencer.c

diff --cc sequencer.c
Simple merge