git cherry-pick before archive

From: Denis Bueno <dbueno@gmail.com>
Date: Jul 11, 2008, 15:46 UTC
Message-ID: <6dbd4d000807110846m2921ddb9r88eb3986762b8f81@mail.gmail.com>

Hi all,

I'm trying to use git archive to create a kind of "release" tarball of my source. I've got a patch (a commit) that I'd like to apply to the tree before I call git archive on HEAD. Currently my command is:

    git archive --format=tar --prefix=pfx/ HEAD | gzip > prj.tgz

If I were to actually modify my tree & history, I'd change the command to:

    git cherry-pick 97a1235ce674f7cf4df3129cd0ab1ae0793db392
    git archive --format=tar --prefix=pfx/ HEAD | gzip > prj.tgz
    git reset --hard HEAD^

But I'd rather not modify my history, if it's possible. (This will create a bunch of dangling commit objects over time, no?)

-- 
 Denis