diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2010-01-14 06:54:57 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-01-14 00:27:57 -0800 |
| commit | 6bdcd0d2fcca7c3985a078c8d343a863136fb675 (patch) | |
| tree | 4ec799d5aa1232edc2054646054c2768e5af272c /builtin-replace.c | |
| parent | t3404: Set up more of the test repo in the "setup" step (diff) | |
| download | tgif-6bdcd0d2fcca7c3985a078c8d343a863136fb675.tar.xz | |
rebase -i: Retain user-edited commit messages after squash/fixup conflicts
When a squash/fixup fails due to a conflict, the user is required to
edit the commit message. Previously, if further squash/fixup commands
followed the conflicting squash/fixup, this user-edited message was
discarded and a new automatically-generated commit message was
suggested.
Change the handling of conflicts within squash/fixup command series:
Whenever the user is required to intervene, consider the resulting
commit to be a new basis for the following squash/fixups and use its
commit message in later suggested combined commit messages.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-replace.c')
0 files changed, 0 insertions, 0 deletions