{"id":603,"date":"2009-07-08T22:03:21","date_gmt":"2009-07-09T06:03:21","guid":{"rendered":"http:\/\/www.codebelay.com\/blog\/?p=603"},"modified":"2010-07-29T08:35:07","modified_gmt":"2010-07-29T16:35:07","slug":"git-how-to-cherry-pick-commits-and-package-them-under-a-tag","status":"publish","type":"post","link":"https:\/\/www.codebelay.com\/blog\/2009\/07\/08\/git-how-to-cherry-pick-commits-and-package-them-under-a-tag\/","title":{"rendered":"Git: How to Cherry Pick Commits and Package them Under a Tag"},"content":{"rendered":"

I’ve pretty much come to rely on git to pull me out of any bad jams in the chaotic environment I work in.<\/p>\n

One thing I’ve had to learn to do is cherry pick commits and package them under a tag in git.<\/p>\n

Here’s how to do it if you were working with my newLISP project called Sitebeagle:<\/p>\n

fork sitebeagle on this page<\/a><\/p>\n

cd sitebeagle<\/p>\n

git fetch –tags<\/p>\n

git checkout 8f5bb33a771f7811d21b8c96cec67c28818de076<\/p>\n

git checkout -b sample_cherry_pick<\/p>\n

git cherry-pick 22aab7<\/p>\n

git cherry-pick b1334775<\/p>\n

git diff sample_cherry_pick..master<\/p>\n

git tag leaving_out_one_commit<\/p>\n

git push origin –tags<\/p>\n

At this point, you should have a tagged branch that doesn’t have the commit with the change to the “2nd file.” The diff should look exactly like this:<\/p>\n

diff –git a\/test.lsp b\/test.lsp
\nindex 9cf1667..158b625 100755
\n— a\/test.lsp
\n+++ b\/test.lsp
\n@@ -1,6 +1,7 @@
\n #!\/usr\/bin\/newlisp<\/p>\n

; test tag test_a
\n+; cherry pick test 2<\/p>\n

(load “sitebeagle.lsp”)
\n (load “twitter.lsp”);<\/p>\n","protected":false},"excerpt":{"rendered":"

I’ve pretty much come to rely on git to pull me out of any bad jams in the chaotic environment I work in. One thing I’ve had to learn to do is cherry pick commits and package them under a tag in git. Here’s how to do it if you were working with my newLISP […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[170,206,4],"tags":[],"class_list":["post-603","post","type-post","status-publish","format-standard","hentry","category-command-line","category-git","category-how-to"],"_links":{"self":[{"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/posts\/603","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/comments?post=603"}],"version-history":[{"count":0,"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/posts\/603\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/media?parent=603"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/categories?post=603"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.codebelay.com\/blog\/wp-json\/wp\/v2\/tags?post=603"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}