On 20 December 2013 18:51, Stephen Henson via RT <r...@openssl.org> wrote: > Well I have to admit to being far from a git expert. For me it's best if it's > easy to get the patches with commit messages and authorship somewhere I can > review them. If I manually have to apply multiple patches and add appropriate > credit it's a pain.
I had this problem with my ocb patch recently. For future reference, I solved it by creating a temporary branch and using git merge --squash. So if your commits are on "my-branch", and you want to create a patch against master: #Create temp branch git checkout master git checkout -b my-branch-tmp #Merge commits into one git merge --squash my-branch git commit -m "my commit message" #Create patch git format-patch master --stdout >../my-branch.patch #Delete temp branch git checkout master git branch -D my-branch-tmp Matt ______________________________________________________________________ OpenSSL Project http://www.openssl.org Development Mailing List openssl-dev@openssl.org Automated List Manager majord...@openssl.org
