]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f13710e 4c063c8)
Merge branch 'pw/rebase-i-error-message' into maint-2.45
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:27:56 +0000 (09:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Jul 2024 16:27:56 +0000 (09:27 -0700)
commit3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89
tree68475f052dca99cd0943686fc1ce9dd3043049a9tree | snapshot
parentf13710e32e69fd267c61035731af61913db2060bcommit | diff
parent4c063c82e9611ffd31353ababa96a0a39d9d7d85commit | diff
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()
advice.c diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
sequencer.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.