| commit | 03270628ed61f56431658eacd335b8f2f8ecc05a | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Thu, 20 Dec 2007 07:12:12 +0000 (20 02:12 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 20 Dec 2007 09:12:41 +0000 (20 01:12 -0800) | ||
| tree | 9667198d3ea05e03371ac965ba6daa8ac63e3eb4 | treesnapshot (tar.gz zip) |
| parent | fbcf1184026197128582369074201c490009b4eb | commitdiff |
Reallow git-rebase --interactive --continue if commit is unnecessary
During git-rebase --interactive's --continue implementation we used
to silently restart the rebase if the user had made the commit
for us. This is common if the user stops to edit a commit and
does so by amending it. My recent change to watch git-commit's
exit status broke this behavior.
Thanks to Bernt Hansen for catching it in 1.5.4-rc1.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
During git-rebase --interactive's --continue implementation we used
to silently restart the rebase if the user had made the commit
for us. This is common if the user stops to edit a commit and
does so by amending it. My recent change to watch git-commit's
exit status broke this behavior.
Thanks to Bernt Hansen for catching it in 1.5.4-rc1.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |