Nazri Ramliy <ayiehere@xxxxxxxxx> writes: > I'd hit that key in my editor that filters the pick instructions add > inserts the list of the modified files in each commit so that the > instruction sheet becomes like this: > > pick deadbeef some commit message > # M path/to/foo.txt | 15 ++++---------- > pick cafebabe another commit message > # M bar.txt | 2 +- > > > IIRC before git 2.6.0 this worked fine. Confirmed: Git 2.1.4 accepts this, 2.6 doesn't: Warning: the command isn't recognized in the following line: - # pick dbafac11052a0075233bdcf0b71f54d1503aa82d test You can fix this with 'git rebase --edit-todo'. Or you can abort the rebase with 'git rebase --abort'. I didn't bisect, but I guess this was introduced in the series introducing this check on the todolist before starting the bisection. Actually, I think we accepted indented comments by mistake: the semantics of comments in Git is usually that it must start at the first column (try an indented # in a commit buffer, it's not a comment). But since Git accepted it in the past, we should continue accepting it to avoid breaking the user experience. No time to send a patch right now, but I will hopefully be able to do this within the next few days. It should be essentially a s/^ *// before calling stripspaces. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html