diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-12 23:48:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-12 23:48:38 (GMT) |
| commit | 054d2fa05cf0bc55fe1556c9e87d58d67a144f44 (patch) | |
| tree | efda16efdfad47941f14d19782d2f1518ef0c75c /git-rebase--interactive.sh | |
| parent | a8c37a0e011d67e3192834a0fffe17452ea57a08 (diff) | |
| parent | 8efa5f629efb9a8af48619ee90dee02343e0f19d (diff) | |
| download | git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.zip git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.gz git-054d2fa05cf0bc55fe1556c9e87d58d67a144f44.tar.bz2 | |
Merge branch 'maint'
* maint:
remote-curl: Fix Accept header for smart HTTP connections
grep: -L should show empty files
rebase--interactive: Ignore comments and blank lines in peek_next_command
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index d529328..6ed57e2 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -322,7 +322,7 @@ make_squash_message () { } peek_next_command () { - sed -n "1s/ .*$//p" < "$TODO" + sed -n -e "/^#/d" -e "/^$/d" -e "s/ .*//p" -e "q" < "$TODO" } do_next () { |