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 /advice.c | |
| parent | e4ecba994c731fb23786b5ae0b6cddc13694fce1 (diff) | |
| parent | 4c063c82e9611ffd31353ababa96a0a39d9d7d85 (diff) | |
| download | git-83ac567781b53f7101c2a9b44462df447bbdc2c6.tar.gz | |
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 'advice.c')
| -rw-r--r-- | advice.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -70,6 +70,7 @@ static struct { [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName" }, [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected" }, [ADVICE_PUSH_UPDATE_REJECTED_ALIAS] = { "pushNonFastForward" }, /* backwards compatibility */ + [ADVICE_REBASE_TODO_ERROR] = { "rebaseTodoError" }, [ADVICE_REF_SYNTAX] = { "refSyntax" }, [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh" }, [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict" }, |