]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 52d9dc2 9645a08)
Merge branch 'ah/sequencer-rewrite-todo-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2023 16:37:23 +0000 (09:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 2 Aug 2023 16:37:24 +0000 (09:37 -0700)
commit8bfb359844cf51aedaf0d28486d4ce9867ccb46c
treef8bafe397c5166cf1b67981727fa504d7cfa057atree | snapshot
parent52d9dc20e1ddd5ac6b9e9113983b2f8d6977e6b0commit | diff
parent9645a087c2e848b8f48d03a3ae3222c5d5aa8261commit | diff
Merge branch 'ah/sequencer-rewrite-todo-fix'

When the user edits "rebase -i" todo file so that it starts with a
"fixup", which would make it invalid, the command truncated the
rest of the file before giving an error and returning the control
back to the user.  Stop truncating to make it easier to correct
such a malformed todo file.

* ah/sequencer-rewrite-todo-fix:
  sequencer: finish parsing the todo list despite an invalid first line
sequencer.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.