![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:41:48 +0000 (14:41 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 20 Jan 2010 22:41:48 +0000 (14:41 -0800) | ||
| commit | cc6b41cc7d38c1b2de9809c0995087a2378d27ec | |
| tree | a0192c7abe36de838db16737fdf7972007d8d776 | tree | snapshot |
| parent | 533e8af50ed6e89eabc421478c9021c4da5f404d | commit | diff |
| parent | 234b3dae2fe83ae7df2c82194cd5f5eb01fd166d | commit | diff |
Merge branch 'mh/rebase-fixup' (early part)
* 'mh/rebase-fixup' (early part):
rebase-i: Ignore comments and blank lines in peek_next_command
lib-rebase: Allow comments and blank lines to be added to the rebase script
lib-rebase: Provide clearer debugging info about what the editor did
Add a command "fixup" to rebase --interactive
t3404: Use test_commit to set up test repository
* 'mh/rebase-fixup' (early part):
rebase-i: Ignore comments and blank lines in peek_next_command
lib-rebase: Allow comments and blank lines to be added to the rebase script
lib-rebase: Provide clearer debugging info about what the editor did
Add a command "fixup" to rebase --interactive
t3404: Use test_commit to set up test repository
| git-rebase--interactive.sh | diff1 | | diff2 | | blob | history |