Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
commit_ref_update(): remove the flags parameter
[gitweb.git]
/
git-rebase--interactive.sh
diff --git
a/git-rebase--interactive.sh
b/git-rebase--interactive.sh
index 4cde685b43a4463bac5f96bcb4f8ed8b3e9347be..9ea30756f13349c96784f0091da4c3c667166485 100644
(file)
--- a/
git-rebase--interactive.sh
+++ b/
git-rebase--interactive.sh
@@
-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)