diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-07-02 09:27:56 -0700 |
| commit | 3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89 (patch) | |
| tree | 68475f052dca99cd0943686fc1ce9dd3043049a9 /commit.c | |
| parent | Merge branch 'ds/format-patch-rfc-and-k' into maint-2.45 (diff) | |
| parent | rebase -i: improve error message when picking merge (diff) | |
| download | git-3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89.tar.gz git-3e50dfdfc9c1f70ae60bf095e4813b29b63dbc89.zip | |
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()
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions