зеркало из https://github.com/microsoft/git.git
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:
Коммит
5c788e7746
|
@ -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)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче