mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 17:36:08 +02:00
Code

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
parent 8b7475aefc 14c793e8f4
commit 5c788e7746
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-rebase--interactive.sh
View File

@ -548,7 +548,8 @@ do_next () {
mark_action_done
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
;;
squash|s|fixup|f)