Skip to content

Commit a8ccc20

Browse files
Johannes Sixtgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e358f3c commit a8ccc20

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-rebase--interactive.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ do_next () {
277277
die_with_patch $sha1 "Could not apply $sha1... $rest"
278278
make_patch $sha1
279279
: > "$DOTEST"/amend
280-
warn
280+
warn "Stopped at $sha1... $rest"
281281
warn "You can amend the commit now, with"
282282
warn
283283
warn " git commit --amend"

0 commit comments

Comments
 (0)