| commit | 0becb3e4b94f19358f66ec2f4bbbf89904251bf5 | |
| author | Andrew Wong <andrew.kw.w@gmail.com> | |
| Wed, 30 Nov 2011 15:52:51 +0000 (30 10:52 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Nov 2011 19:30:53 +0000 (30 11:30 -0800) | ||
| tree | 649429598473654373c7d224ef6e3f106a3a23f0 | treesnapshot (tar.gz zip) |
| parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec | commitdiff |
rebase -i: interrupt rebase when "commit --amend" failed during "reword"
"commit --amend" could fail in cases like the user empties the commit
message, or pre-commit failed. When it fails, rebase should be
interrupted and alert the user, rather than ignoring the error and
continue on rebasing. This also gives users a way to gracefully
interrupt a "reword" if they decided they actually want to do an "edit",
or even "rebase --abort".
Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
"commit --amend" could fail in cases like the user empties the commit
message, or pre-commit failed. When it fails, rebase should be
interrupted and alert the user, rather than ignoring the error and
continue on rebasing. This also gives users a way to gracefully
interrupt a "reword" if they decided they actually want to do an "edit",
or even "rebase --abort".
Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |