{"thread":{"id":"4049","subject":"[PATCH 2/3] Added definitions for a few words:","startedAt":"2006-05-04T04:18:59Z","lastAt":"2006-05-04T04:18:59Z","messageCount":1,"participants":["Jon Loeliger"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"19495","messageId":"E1FbVIp-0004UB-1f@jdl.com","threadId":"4049","inReplyTo":null,"subject":"[PATCH 2/3] Added definitions for a few words:","fromName":"Jon Loeliger","fromEmail":"jdl@jdl.com","sentAt":"2006-05-04T04:18:59Z","receivedAt":"2006-05-04T04:18:59Z","isPatch":true,"sender":{"key":"jdl@jdl.com","avatar":"https://gravatar.com/avatar/75ce9a10b151acd2c28ec4ab2136dba7b2ff1634530bd04b155981a749d08a64?d=mp&s=160"},"body":"\n    fast forward\n    pickaxe\n    refspec\n    tracking branch\n\nWild hack allows \"link:git-\" prefix to reference commands too.\n\nSigned-off-by: Jon Loeliger <jdl@jdl.com>\n\n\n---\n\nYep, this pickaxe entry is b0rked.\nApply the next patch too.\n\n\n Documentation/glossary.txt     |   33 +++++++++++++++++++++++++++++++++\n Documentation/sort_glossary.pl |    2 +-\n 2 files changed, 34 insertions(+), 1 deletions(-)\n\nb63f925f5f88549581324257d3b2030163389a98\ndiff --git a/Documentation/glossary.txt b/Documentation/glossary.txt\nindex 075c078..86196c4 100644\n--- a/Documentation/glossary.txt\n+++ b/Documentation/glossary.txt\n@@ -68,6 +68,14 @@ ent::\n \t`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth\n \texplanation.\n \n+fast forward::\n+\tA fast-forward is a special type of merge where you have\n+\ta revision and you are \"merging\" another branch's changes\n+\tthat happen to be a descendant of what you have.\n+\tIn such these cases, you do not make a new merge commit but\n+\tinstead just update to his revision. This will happen\n+\tfrequently on a tracking branch of a remote repository.\n+\n fetch::\n \tFetching a branch means to get the branch's head ref from a\n \tremote repository, to find out which objects are missing from\n@@ -160,6 +168,12 @@ parent::\n \tA commit object contains a (possibly empty) list of the logical\n \tpredecessor(s) in the line of development, i.e. its parents.\n \n+pickaxe:: The term pickaxe refers to an option to the diffcore routines\n+\tthat help select changes that add or delete a given text string.\n+\tWith the --pickaxe-all option, it can be used to view the\n+\tfull changeset that introduced or removed, say, a particular\n+\tline of text.  See gitlink:git-diff[1].\n+\n plumbing::\n \tCute name for core git.\n \n@@ -193,6 +207,18 @@ ref::\n \tA 40-byte hex representation of a SHA1 pointing to a particular\n \tobject. These may be stored in `$GIT_DIR/refs/`.\n \n+refspec::\n+\tA refspec is used by fetch and push to describe the mapping\n+\tbetween remote ref and local ref.  They are combined with\n+\ta colon in the format <src>:<dst>, preceded by an optional\n+\tplus sign, +.  For example:\n+\t`git fetch $URL refs/heads/master:refs/heads/origin`\n+\tmeans \"grab the master branch head from the $URL and store\n+\tit as my origin branch head\".\n+\tAnd `git push $URL refs/heads/master:refs/heads/to-upstream`\n+\tmeans \"publish my master branch head as to-upstream master head\n+\tat $URL\".   See also gitlink:git-push[1]\n+\n repository::\n \tA collection of refs together with an object database containing\n \tall objects, which are reachable from the refs, possibly accompanied\n@@ -217,6 +243,13 @@ SCM::\n SHA1::\n \tSynonym for object name.\n \n+tracking branch::\n+\tA regular git branch that is used to follow changes from\n+\tanother repository.  A tracking branch should not contain\n+\tdirect modifications or made commits made locally.\n+\tA tracking branch can usually be identified as the\n+\tright-hand-side ref in a Pull: refspec.\n+\n tree object::\n \tAn object containing a list of file names and modes along with refs\n \tto the associated blob and/or tree objects. A tree is equivalent\ndiff --git a/Documentation/sort_glossary.pl b/Documentation/sort_glossary.pl\nindex e57dc78..e0bc552 100644\n--- a/Documentation/sort_glossary.pl\n+++ b/Documentation/sort_glossary.pl\n@@ -48,7 +48,7 @@ This list is sorted alphabetically:\n ';\n \n @keys=sort {uc($a) cmp uc($b)} keys %terms;\n-$pattern='(\\b'.join('\\b|\\b',reverse @keys).'\\b)';\n+$pattern='(\\b(?<!link:git-)'.join('\\b|\\b(?<!link:git-)',reverse @keys).'\\b)';\n foreach $key (@keys) {\n \t$terms{$key}=~s/$pattern/sprintf \"<<ref_\".no_spaces($1).\",$1>>\";/eg;\n \tprint '[[ref_'.no_spaces($key).']]'.$key.\"::\\n\"\n-- \n1.3.1.g3d990\n"}]}