diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-20 15:45:15 -0700 |
| commit | 83ac567781b53f7101c2a9b44462df447bbdc2c6 (patch) | |
| tree | db5bbfa1a13643877b760179e70ceda0a2e310b2 /diff.c | |
| parent | Merge branch 'ds/ahead-behind-fix' (diff) | |
| parent | rebase -i: improve error message when picking merge (diff) | |
| download | git-83ac567781b53f7101c2a9b44462df447bbdc2c6.tar.gz git-83ac567781b53f7101c2a9b44462df447bbdc2c6.zip | |
Merge branch 'pw/rebase-i-error-message'
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 'diff.c')
0 files changed, 0 insertions, 0 deletions