On Tue, Aug 16, 2016 at 3:46 AM, Philip Oakley <philipoak...@iee.org> wrote: > From: "Jacob Keller" <jacob.kel...@gmail.com> > [nip] >>> >>> >>> I've no problem with more extensive methods for those preparing very big >>> patch series, or with those needing to merge together a lot of series and >>> want to keep the cover letters, but ensuring that a simple flow is >>> possible >>> should still be there. >>> -- >>> Philip >>> >> >> Some people have suggested this simple idea, and I like it, but they >> did mention that modifying the cover letter now requires a rebase over >> a potentially large series of patches, which can get annoying. >> >> Thanks, >> Jake > > > They can just add "squash! cover! <series>" commits for that ;-) Though more > likely the advanced workflow would be used... We'll need both (more than > one) options.
Or even better, "git commit --reword $SHA1" brings up the editor with commit message of $SHA1. Modify any way you want and it creates a new empty, "reword!" commit that contains the diff between the old commit message and the new one. "reword!" can be consumed by "rebase -i --autosquash" without bringing up the editor again. I realize making "git commit --reword" run multiple times would be tricky though... -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
