Merge branch 'ok/rebase-i-count-todo'
* ok/rebase-i-count-todo: Show number of TODO items for interactive rebase
This commit is contained in:
commit
3701aa093e
@ -1031,9 +1031,11 @@ test -s "$todo" || echo noop >> "$todo"
|
|||||||
test -n "$autosquash" && rearrange_squash "$todo"
|
test -n "$autosquash" && rearrange_squash "$todo"
|
||||||
test -n "$cmd" && add_exec_commands "$todo"
|
test -n "$cmd" && add_exec_commands "$todo"
|
||||||
|
|
||||||
|
todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
|
||||||
|
|
||||||
cat >>"$todo" <<EOF
|
cat >>"$todo" <<EOF
|
||||||
|
|
||||||
$comment_char Rebase $shortrevisions onto $shortonto
|
$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s))
|
||||||
EOF
|
EOF
|
||||||
append_todo_help
|
append_todo_help
|
||||||
git stripspace --comment-lines >>"$todo" <<\EOF
|
git stripspace --comment-lines >>"$todo" <<\EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user