| commit | 83ac567781b53f7101c2a9b44462df447bbdc2c6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Jun 2024 22:45:15 +0000 (20 15:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Jun 2024 22:45:15 +0000 (20 15:45 -0700) | ||
| tree | db5bbfa1a13643877b760179e70ceda0a2e310b2 | treesnapshot (tar.gz zip) |
| parent | e4ecba994c731fb23786b5ae0b6cddc13694fce1 | commitdiff |
| parent | 4c063c82e9611ffd31353ababa96a0a39d9d7d85 | commitdiff |
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()
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 |
| builtin/rebase.c | diff1 | diff2 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |
| sequencer.h | diff1 | diff2 | blobhistory |