From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 14 Feb 2020 20:54:21 +0000 (-0800)
Subject: Merge branch 'ag/edit-todo-drop-check'
X-Git-Tag: v2.26.0-rc0~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dbeecba27983a86c17383280856bbbe385ceb8d;p=thirdparty%2Fgit.git

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
---

4dbeecba27983a86c17383280856bbbe385ceb8d