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
This commit is contained in:
Junio C Hamano 2016-04-13 14:12:30 -07:00
Родитель 8b7475aefc 14c793e8f4
Коммит 5c788e7746
1 изменённых файлов: 2 добавлений и 1 удалений

Просмотреть файл

@ -548,7 +548,8 @@ do_next () {
mark_action_done mark_action_done
do_pick $sha1 "$rest" do_pick $sha1 "$rest"
warn "Stopped at $sha1... $rest" sha1_abbrev=$(git rev-parse --short $sha1)
warn "Stopped at $sha1_abbrev... $rest"
exit_with_patch $sha1 0 exit_with_patch $sha1 0
;; ;;
squash|s|fixup|f) squash|s|fixup|f)