diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:28:06 -0800 |
| commit | 3701aa093e2d2d003e0b04529375aeb1bbcb401d (patch) | |
| tree | a53d51af62df87987302f970ab7db0f2c537feea | |
| parent | aa9066fccd4a4320ab3e90f566527b7497d2c7c0 (diff) | |
| parent | 97f05f43dc73f2855eb4c6acd1ea49d6d6bc4bce (diff) | |
| download | git-3701aa093e2d2d003e0b04529375aeb1bbcb401d.tar.gz | |
Merge branch 'ok/rebase-i-count-todo'
* ok/rebase-i-count-todo:
Show number of TODO items for interactive rebase
| -rw-r--r-- | git-rebase--interactive.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index b64dd28acf..c6a4629cbc 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1031,9 +1031,11 @@ test -s "$todo" || echo noop >> "$todo" test -n "$autosquash" && rearrange_squash "$todo" test -n "$cmd" && add_exec_commands "$todo" +todocount=$(git stripspace --strip-comments <"$todo" | wc -l) + cat >>"$todo" <<EOF -$comment_char Rebase $shortrevisions onto $shortonto +$comment_char Rebase $shortrevisions onto $shortonto ($todocount TODO item(s)) EOF append_todo_help git stripspace --comment-lines >>"$todo" <<\EOF |