| commit | 2b77029f4ad556b82cdbadf59ae13d41e23b6e7c | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Mon, 11 Jan 2010 15:56:45 +0000 (11 16:56 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Jan 2010 04:31:48 +0000 (11 20:31 -0800) | ||
| tree | 60c92ac522931f51930f7d90ab9294e6377c2cc0 | treesnapshot (tar.gz zip) |
| parent | 8fb5d44a47dd3657c8be0de5dcf220935b04e98e | commitdiff |
rebase--interactive: Ignore comments and blank lines in peek_next_command
Previously, blank lines and/or comments within a series of
squash/fixup commands would confuse "git rebase -i" into thinking that
the series was finished. It would therefore require the user to edit
the commit message for the squash/fixup commits seen so far. Then,
after continuing, it would ask the user to edit the commit message
again.
Ignore comments and blank lines within a group of squash/fixup
commands, allowing them to be processed in one go.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Previously, blank lines and/or comments within a series of
squash/fixup commands would confuse "git rebase -i" into thinking that
the series was finished. It would therefore require the user to edit
the commit message for the squash/fixup commits seen so far. Then,
after continuing, it would ask the user to edit the commit message
again.
Ignore comments and blank lines within a group of squash/fixup
commands, allowing them to be processed in one go.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory |