Hello Viresh, On Wed, Aug 20, 2014 at 8:39 AM, Viresh Kumar <viresh.kumar@xxxxxxxxxx> wrote: > On 20 August 2014 01:14, Tuomas Tynkkynen <ttynkkynen@xxxxxxxxxx> wrote: >> There's actually a (mis-?)feature in git format-patch: a literal '---' >> line in a commit message won't be escaped, so the patch notes can be >> written in the commit message directly so the patch files don't need >> to be modified by hand. > > How exactly? Can you list the command here please.. > -- I rely on the behavior that Tuomas is mentioning as well but is not about git format-patch but git am. As you already know when you apply a patch with git am, everything that is between a line with 3 dashes line (---) and the actual diff is omitted since that is where the generated diffstat is placed by git format-patch. We usually rely on that behavior to put there the history of a patch or any information that we think that is useful for reviewers but is not suitable to end in the commit message. Now that means that you have to generate the patch and then manually edit it to add the history there. But since git am omits any text between the first "---" and the diff, it means that you can add a "---" on your actual commit message and anything that follows will be discarded by git am, that way you can maintain your history on your commit message which is way less tedious than manually editing patches. 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. 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
