Skip to contentSkip to conversation

Show number of commits being rebased interactively

PATCH New Onno Kortmann 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Show number of commits being rebased interactively

During 'rebase -i', a wrong edit command might inadvertently drop commits. This change shows the total number of commits in the comments below the commit list. After a rebase edit, this number can be quickly compared to the line number of the last commit in the rebase TODO list.

---
 git-rebase--interactive.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
git-rebase--interactive.sh +2 -0
index b64dd28..b266dc0 100644
@@ -1031,9 +1031,11 @@ test -s "$todo" || echo noop >> "$todo"
 test -n "$autosquash" && rearrange_squash "$todo"
 test -n "$cmd" && add_exec_commands "$todo"
 +commitcount=$(git stripspace --strip-comments <"$todo"  | wc -l)
+
 cat >>"$todo" <<EOF
 -$comment_char Rebase $shortrevisions onto $shortonto
+$comment_char Rebase $shortrevisions onto $shortonto ($commitcount commit(s))
 EOF
 append_todo_help
 git stripspace --comment-lines >>"$todo" <<\EOF
Signature · 1 line
2.2.0.rc1.1.gbab0d06