diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-15 14:57:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-15 14:57:10 -0700 |
| commit | 7a46cd63a842c6fa3267078e7ef0f6b63464efce (patch) | |
| tree | 6c380a28cbf9e2f49bfa45a938c7661bfb3224b0 /git-rebase.txt | |
| parent | 35a5155ef556183ec87fa45c0d7314dc4e2d70b3 (diff) | |
| download | git-htmldocs-7a46cd63a842c6fa3267078e7ef0f6b63464efce.tar.gz | |
Autogenerated HTML docs for v2.26.0-rc1-11-g30e99
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index 8c1f4b826..f7a603360 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -699,6 +699,16 @@ suffer from the same shortcoming. (See https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for details.) +Commit Rewording +~~~~~~~~~~~~~~~~ + +When a conflict occurs while rebasing, rebase stops and asks the user +to resolve. Since the user may need to make notable changes while +resolving conflicts, after conflicts are resolved and the user has run +`git rebase --continue`, the rebase should open an editor and ask the +user to update the commit message. The merge backend does this, while +the apply backend blindly applies the original commit message. + Miscellaneous differences ~~~~~~~~~~~~~~~~~~~~~~~~~ |