{"thread":{"id":"4013","subject":"[RFC] Terms to add to glossary","startedAt":"2006-04-30T19:18:17Z","lastAt":"2006-05-03T21:41:35Z","messageCount":6,"participants":["Jakub Narebski","Junio C Hamano","Jon Loeliger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"19300","messageId":"e332g6$hpl$1@sea.gmane.org","threadId":"4013","inReplyTo":null,"subject":"[RFC] Terms to add to glossary","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-04-30T19:18:17Z","receivedAt":"2006-04-30T19:18:17Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"I'd like the following terms to be added to and described in git glossary:\nAny takers?\n\n\ntopic branches::\n\npickaxe::\n\ncherry pick:: (cherry picking)\n\nrefspec::\n\npatch::\n\nrev::\n\nrevert:: (commit)\n\nfast-forward:: (branch)\n\nannotate:: (blame)\n\nsymbolic ref::\n\n\nBTW. it might be worth to take a look at \n http://en.wikipedia.org/wiki/Revision_control#Vocabulary\nand either expand git glossary, or correct Wikipedia entry.\n\n-- \nJakub Narebski\nWarsaw, Poland\n"},{"id":"19335","messageId":"e35sin$c1l$1@sea.gmane.org","threadId":"4013","inReplyTo":"e332g6$hpl$1@sea.gmane.org","subject":"Re: [RFC] Terms to add to glossary","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-05-01T20:55:43Z","receivedAt":"2006-05-01T20:55:43Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"cherry picking:: \n In SCM jargon, cherry picking is used to describe the action of \n selecting which commit should be ported from one branch to another. \n In GIT it means given one existing commit, apply the change \n the patch introduces, and record a new commit that records it.\n\n-- \nJakub Narebski\nWarsaw, Poland\n"},{"id":"19344","messageId":"e36rov$i7v$1@sea.gmane.org","threadId":"4013","inReplyTo":"e332g6$hpl$1@sea.gmane.org","subject":"Re: [RFC] Terms to add to glossary","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-05-02T05:48:08Z","receivedAt":"2006-05-02T05:48:08Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"pickaxe::\n \"pickaxe\" (\"a tool for the software archaeologist\") support is \n an additional layer to interrogation commands that can be used \n to further specify exactly what you're looking for, if you already \n know the specific area that changed. It refers to -S option\n in git-diff-tree.\n\n-- \nJakub Narebski\nWarsaw, Poland\n"},{"id":"19345","messageId":"7v8xpkq5hw.fsf@assigned-by-dhcp.cox.net","threadId":"4013","inReplyTo":"e35sin$c1l$1@sea.gmane.org","subject":"Re: [RFC] Terms to add to glossary","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-05-02T06:56:43Z","receivedAt":"2006-05-02T06:56:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski writes:\n\n> cherry picking:: \n> In SCM jargon, cherry picking is used to describe the action of \n> selecting which commit should be ported from one branch to another. \n> In GIT it means given one existing commit, apply the change \n> the patch introduces, and record a new commit that records it.\n\nI am not sure what the focus of the above description is. I\nmyself got more confused after reading it than before ;-). My\nimpression was that we have been using the word \"cherry-pick\" in\npretty standard way, but are you trying to stress that we use\nthe word in a different sense?\n\n\"Action of selecting\" is done by the user, perhaps with or\nwithout help from the tool. After deciding which one to \"port\",\nthe way to perform the actual \"port\" would be different from SCM\nto SCM, and in GIT it is often done with the \"git-cherry-pick\"\ncommand. Are you saying the command is misnamed, and we should\ncall a program that helps the user in \"action of selecting\"\ncherry-pick (actually, I think \"git cherry\" fits that\ndescription)?\n\nIf the focus is not to highlight the distinction but to help the\nend user, something like this might be better.\n\ncherry-picking::\n\tIn SCM jargon, \"cherry pick\" means to choose a subset of\n\tchanges out of a series of changes (typically commits)\n\tand record them as a separate series of changes on top\n\tof different codebase. In GIT, this is performed by\n\t\"git cherry-pick\" command to extract the change\n\tintroduced by an existing commit and to record it based\n\ton the tip of the current branch as a new commit.\n"},{"id":"19347","messageId":"e3706k$s36$1@sea.gmane.org","threadId":"4013","inReplyTo":"7v8xpkq5hw.fsf@assigned-by-dhcp.cox.net","subject":"Re: [RFC] Terms to add to glossary","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-05-02T07:03:42Z","receivedAt":"2006-05-02T07:03:42Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano wrote:\n\n> cherry-picking::\n> In SCM jargon, \"cherry pick\" means to choose a subset of\n> changes out of a series of changes (typically commits)\n> and record them as a separate series of changes on top\n> of different codebase. In GIT, this is performed by\n> \"git cherry-pick\" command to extract the change\n> introduced by an existing commit and to record it based\n> on the tip of the current branch as a new commit.\n\nThat's better.\n\n-- \nJakub Narebski\nWarsaw, Poland\n"},{"id":"19470","messageId":"1146692495.24239.183.camel@cashmere.sps.mot.com","threadId":"4013","inReplyTo":"e332g6$hpl$1@sea.gmane.org","subject":"Re: [RFC] Terms to add to glossary","fromName":"Jon Loeliger","fromEmail":"jdl@freescale.com","sentAt":"2006-05-03T21:41:35Z","receivedAt":"2006-05-03T21:41:35Z","isPatch":false,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"On Sun, 2006-04-30 at 14:18, Jakub Narebski wrote:\n> I'd like the following terms to be added to and described in git glossary:\n> Any takers?\n\nIf someone hasn't beaten me to it, I have (most)\nof them read to be sent in... Lemme go home \nand dig around some...\n\njdl\n"}]}