]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 733b640 ade14bf)
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)
commitf61d8ce526e2aca24ba5dace0ca25bee67051ff1
treef94edcf77cbd55c54557f26367dab7485ccd874btree | snapshot
parent733b640d5099df783f28ddf8ce35749b8c53f206commit | diff
parentade14bffd71b75974492cf7afc525b8feb8a70b2commit | diff
Merge branch 'ow/rebase-verify-insn-fmt-before-initializing-state'

"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
builtin/rebase.c diff1 | diff2 | blob | history
t/t3415-rebase-autosquash.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.