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 /Documentation/config | |
| parent | e4ecba994c731fb23786b5ae0b6cddc13694fce1 (diff) | |
| parent | 4c063c82e9611ffd31353ababa96a0a39d9d7d85 (diff) | |
| download | git-83ac567781b53f7101c2a9b44462df447bbdc2c6.tar.xz | |
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 'Documentation/config')
| -rw-r--r-- | Documentation/config/advice.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt index 0e35ae5240..fa61241756 100644 --- a/Documentation/config/advice.txt +++ b/Documentation/config/advice.txt @@ -96,6 +96,8 @@ advice.*:: `pushNonFFCurrent`, `pushNonFFMatching`, `pushAlreadyExists`, `pushFetchFirst`, `pushNeedsForce`, and `pushRefNeedsUpdate` simultaneously. + rebaseTodoError:: + Shown when there is an error after editing the rebase todo list. refSyntax:: Shown when the user provides an illegal ref name, to tell the user about the ref syntax documentation. |