From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 2 Jul 2024 16:27:56 +0000 (-0700)
Subject: Merge branch 'pw/rebase-i-error-message' into maint-2.45
X-Git-Tag: v2.46.0-rc0~13^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89;p=thirdparty%2Fgit.git

Merge branch 'pw/rebase-i-error-message' into maint-2.45

When the user adds to "git rebase -i" instruction to "pick" a merge
commit, the error experience is not pleasant.  Such an error is now
caught earlier in the process that parses the todo list.

* pw/rebase-i-error-message:
  rebase -i: improve error message when picking merge
  rebase -i: pass struct replay_opts to parse_insn_line()
---

3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89