Skip to content

Commit 5c788e7

Browse files
committed
Merge branch 'rt/rebase-i-shorten-stop-report'
The commit object name reported when "rebase -i" stops has been shortened. * rt/rebase-i-shorten-stop-report: rebase-i: print an abbreviated hash when stop for editing
2 parents 8b7475a + 14c793e commit 5c788e7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

git-rebase--interactive.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,7 +548,8 @@ do_next () {
548548

549549
mark_action_done
550550
do_pick $sha1 "$rest"
551-
warn "Stopped at $sha1... $rest"
551+
sha1_abbrev=$(git rev-parse --short $sha1)
552+
warn "Stopped at $sha1_abbrev... $rest"
552553
exit_with_patch $sha1 0
553554
;;
554555
squash|s|fixup|f)

0 commit comments

Comments
 (0)