]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ag/edit-todo-drop-check'
authorJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:21 +0000 (12:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 14 Feb 2020 20:54:21 +0000 (12:54 -0800)
Allow the rebase.missingCommitsCheck configuration to kick in when
"rebase --edit-todo" and "rebase --continue" restarts the procedure.

* ag/edit-todo-drop-check:
  rebase-interactive: warn if commit is dropped with `rebase --edit-todo'
  sequencer: move check_todo_list_from_file() to rebase-interactive.c

1  2 
sequencer.c
sequencer.h

diff --cc sequencer.c
Simple merge
diff --cc sequencer.h
Simple merge