| commit | 3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jul 2024 16:27:56 +0000 (2 09:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 2 Jul 2024 16:27:56 +0000 (2 09:27 -0700) | ||
| tree | 68475f052dca99cd0943686fc1ce9dd3043049a9 | treesnapshot (tar.gz zip) |
| parent | f13710e32e69fd267c61035731af61913db2060b | commitdiff |
| parent | 4c063c82e9611ffd31353ababa96a0a39d9d7d85 | commitdiff |
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()
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 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |
| sequencer.h | diff1 | diff2 | blobhistory |