Hello Andreas, On Wed, Aug 20, 2014 at 10:02 PM, Andreas Färber <afaerber@xxxxxxx> wrote: >> >> So the second "---" from Tuomas patch is actually the one generated by >> git format-patch but that gets discarded by git am just like any other >> text so it causes no harm when other apply the patches. >> >> If this not the correct workflow and you have a better way to manage >> this, I would love to know about it. > > One drawback of having --- in the commit message is that you can't > cherry-pick but really need to use git-am for it to be stripped. > It depends on your workflow really, I don't consider the fact that git cherry-pick does not omit that part a drawback but a feature ;-) And as Stephen said you can do a git cherry-pick -e or amend the commit and remove that part. > I resorted to a scripted way of handling change logs: Per patch series I > maintain a shell script that after git-format-patch essentially runs > sed -i "/---/ r /dev/stdin" $OUTDIR/0001-*.patch <<EOCL > ... > EOCL > to insert my text after ---. (sed syntax is not POSIX-compliant FWIW.) > Similarly I fill in the blurbs for the cover letter. > Yes I used to use sed before indeed. Heiko also suggested patman which looks quite interesting and may fit my workflow as well. > > Cheers, > Andreas > > -- Best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
