]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ow/rebase-verify-insn-fmt-before-initializing-state'
authorJunio C Hamano <gitster@pobox.com>
Mon, 4 Aug 2025 01:44:27 +0000 (18:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 4 Aug 2025 01:44:27 +0000 (18:44 -0700)
"git rebase -i" with bogus rebase.instructionFormat configuration
failed to produce the todo file after recording the state files,
leading to confused "git status"; this has been corrected.

* ow/rebase-verify-insn-fmt-before-initializing-state:
  rebase: write script before initializing state

1  2 
builtin/rebase.c
t/t3415-rebase-autosquash.sh

Simple merge
Simple merge