]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit4dbeecba27983a86c17383280856bbbe385ceb8d
treebca9b0de3bfbb74a70ccc8db6bd6999433f8ad02
parentf7f43afb190131d4502f00cecd2361ebbd654030
parent5a5445d8788058c6d038f5f4072316db0d250eeb
Merge branch 'ag/edit-todo-drop-check'

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
sequencer.c
sequencer.h