@matheusbsbs / matheus-bagliano / commits / a8ccc204c5
Fork 0

rebase -i: When an 'edit' stops, mention the commit

In a rebase session where more than one commit is to be 'edit'ed, and the user spends considerable time to 'edit' a commit, it is easy to forget what one wanted to 'edit' at the individual commits. It would be helpful to see at which commit the rebase stopped. Incidentally, if the rebase stopped due to merge conflicts or other errors, the commit was already reported ("Could not apply $sha1..."), but when rebase stopped after successfully applying an "edit" commit, it would not mention it. With this change the commit is reported. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Sixt committed Jul 23, 2008 at 09:46 UTC a8ccc204c5daf4dae4071907499055d2dc9995db
1 file changed +1 -1
git-rebase--interactive.sh
+1 -1
@@ -277,7 +277,7 @@ do_next () {
277 die_with_patch $sha1 "Could not apply $sha1... $rest"
278 make_patch $sha1
279 : > "$DOTEST"/amend
280 - warn
280 + warn "Stopped at $sha1... $rest"
281 warn "You can amend the commit now, with"
282 warn
283 warn " git commit --amend"