| commit | 234b3dae2fe83ae7df2c82194cd5f5eb01fd166d | |
| author | Michael Haggerty <mhagger@alum.mit.edu> | |
| Tue, 12 Jan 2010 15:38:36 +0000 (12 16:38 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 12 Jan 2010 20:34:50 +0000 (12 12:34 -0800) | ||
| tree | 95467cc9c2adfe8007a43376fdc191e4fcb6ac53 | treesnapshot (tar.gz zip) |
| parent | 05c95dbe44b42f9c3f7efe6793d311a26e1b8181 | commitdiff |
rebase-i: 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 | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |