# [RFC] Terms to add to glossary 6 messages from 2006-04-30 to 2006-05-03. Participants: Jakub Narebski, Junio C Hamano, Jon Loeliger. Thread: https://gitlist.dev/t/4013 ## Jakub Narebski, 2006-04-30 19:18 Subject: [RFC] Terms to add to glossary Message-ID: URL: https://gitlist.dev/e/e332g6%24hpl%241%40sea.gmane.org ``` I'd like the following terms to be added to and described in git glossary: Any takers? topic branches:: pickaxe:: cherry pick:: (cherry picking) refspec:: patch:: rev:: revert:: (commit) fast-forward:: (branch) annotate:: (blame) symbolic ref:: BTW. it might be worth to take a look at http://en.wikipedia.org/wiki/Revision_control#Vocabulary and either expand git glossary, or correct Wikipedia entry. -- Jakub Narebski Warsaw, Poland ``` ## Jakub Narebski, 2006-05-01 20:55 Subject: Re: [RFC] Terms to add to glossary Message-ID: URL: https://gitlist.dev/e/e35sin%24c1l%241%40sea.gmane.org In-Reply-To: ``` cherry picking:: In SCM jargon, cherry picking is used to describe the action of selecting which commit should be ported from one branch to another. In GIT it means given one existing commit, apply the change the patch introduces, and record a new commit that records it. -- Jakub Narebski Warsaw, Poland ``` ## Jakub Narebski, 2006-05-02 05:48 Subject: Re: [RFC] Terms to add to glossary Message-ID: URL: https://gitlist.dev/e/e36rov%24i7v%241%40sea.gmane.org In-Reply-To: ``` pickaxe:: "pickaxe" ("a tool for the software archaeologist") support is an additional layer to interrogation commands that can be used to further specify exactly what you're looking for, if you already know the specific area that changed. It refers to -S option in git-diff-tree. -- Jakub Narebski Warsaw, Poland ``` ## Junio C Hamano, 2006-05-02 06:56 Subject: Re: [RFC] Terms to add to glossary Message-ID: <7v8xpkq5hw.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7v8xpkq5hw.fsf%40assigned-by-dhcp.cox.net In-Reply-To: ``` Jakub Narebski writes: > cherry picking:: > In SCM jargon, cherry picking is used to describe the action of > selecting which commit should be ported from one branch to another. > In GIT it means given one existing commit, apply the change > the patch introduces, and record a new commit that records it. I am not sure what the focus of the above description is. I myself got more confused after reading it than before ;-). My impression was that we have been using the word "cherry-pick" in pretty standard way, but are you trying to stress that we use the word in a different sense? "Action of selecting" is done by the user, perhaps with or without help from the tool. After deciding which one to "port", the way to perform the actual "port" would be different from SCM to SCM, and in GIT it is often done with the "git-cherry-pick" command. Are you saying the command is misnamed, and we should call a program that helps the user in "action of selecting" cherry-pick (actually, I think "git cherry" fits that description)? If the focus is not to highlight the distinction but to help the end user, something like this might be better. cherry-picking:: In SCM jargon, "cherry pick" means to choose a subset of changes out of a series of changes (typically commits) and record them as a separate series of changes on top of different codebase. In GIT, this is performed by "git cherry-pick" command to extract the change introduced by an existing commit and to record it based on the tip of the current branch as a new commit. ``` ## Jakub Narebski, 2006-05-02 07:03 Subject: Re: [RFC] Terms to add to glossary Message-ID: URL: https://gitlist.dev/e/e3706k%24s36%241%40sea.gmane.org In-Reply-To: <7v8xpkq5hw.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: > cherry-picking:: > In SCM jargon, "cherry pick" means to choose a subset of > changes out of a series of changes (typically commits) > and record them as a separate series of changes on top > of different codebase. In GIT, this is performed by > "git cherry-pick" command to extract the change > introduced by an existing commit and to record it based > on the tip of the current branch as a new commit. That's better. -- Jakub Narebski Warsaw, Poland ``` ## Jon Loeliger, 2006-05-03 21:41 Subject: Re: [RFC] Terms to add to glossary Message-ID: <1146692495.24239.183.camel@cashmere.sps.mot.com> URL: https://gitlist.dev/e/1146692495.24239.183.camel%40cashmere.sps.mot.com In-Reply-To: ``` On Sun, 2006-04-30 at 14:18, Jakub Narebski wrote: > I'd like the following terms to be added to and described in git glossary: > Any takers? If someone hasn't beaten me to it, I have (most) of them read to be sent in... Lemme go home and dig around some... jdl ```