[RFC] Terms to add to glossary

[RFC] Terms to add to glossary

[Jakub Narebski]

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

Re: [RFC] Terms to add to glossary

[Jakub Narebski]

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

Re: [RFC] Terms to add to glossary

[Junio C Hamano]

Jakub Narebski <jnareb@gmail.com> 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.

Re: [RFC] Terms to add to glossary

[Jakub Narebski]

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

Re: [RFC] Terms to add to glossary

[Jakub Narebski]

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

Re: [RFC] Terms to add to glossary

[Jon Loeliger]

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