Added definitions for a few words:
fast forward pickaxe refspec tracking branch Wild hack allows "link:git-" prefix to reference commands too. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Jon Loeliger committed
May 3, 2006 at 23:18 UTC
9290cd58c374a73cca989879678dc1ee929cdf2e
2 files changed
+34
-1
Documentation/glossary.txt
+33
@@ -68,6 +68,14 @@ ent::
68
`http://en.wikipedia.org/wiki/Ent_(Middle-earth)` for an in-depth
69
explanation.
70
71
+fast forward::
72
+ A fast-forward is a special type of merge where you have
73
+ a revision and you are "merging" another branch's changes
74
+ that happen to be a descendant of what you have.
75
+ In such these cases, you do not make a new merge commit but
76
+ instead just update to his revision. This will happen
77
+ frequently on a tracking branch of a remote repository.
78
+
79
fetch::
80
Fetching a branch means to get the branch's head ref from a
81
remote repository, to find out which objects are missing from
@@ -160,6 +168,12 @@ parent::
168
A commit object contains a (possibly empty) list of the logical
169
predecessor(s) in the line of development, i.e. its parents.
170
171
+pickaxe:: The term pickaxe refers to an option to the diffcore routines
172
+ that help select changes that add or delete a given text string.
173
+ With the --pickaxe-all option, it can be used to view the
174
+ full changeset that introduced or removed, say, a particular
175
+ line of text. See gitlink:git-diff[1].
176
+
177
plumbing::
178
Cute name for core git.
179
@@ -193,6 +207,18 @@ ref::
207
A 40-byte hex representation of a SHA1 pointing to a particular
208
object. These may be stored in `$GIT_DIR/refs/`.
209
210
+refspec::
211
+ A refspec is used by fetch and push to describe the mapping
212
+ between remote ref and local ref. They are combined with
213
+ a colon in the format <src>:<dst>, preceded by an optional
214
+ plus sign, +. For example:
215
+ `git fetch $URL refs/heads/master:refs/heads/origin`
216
+ means "grab the master branch head from the $URL and store
217
+ it as my origin branch head".
218
+ And `git push $URL refs/heads/master:refs/heads/to-upstream`
219
+ means "publish my master branch head as to-upstream master head
220
+ at $URL". See also gitlink:git-push[1]
221
+
222
repository::
223
A collection of refs together with an object database containing
224
all objects, which are reachable from the refs, possibly accompanied
@@ -217,6 +243,13 @@ SCM::
243
SHA1::
244
Synonym for object name.
245
246
+tracking branch::
247
+ A regular git branch that is used to follow changes from
248
+ another repository. A tracking branch should not contain
249
+ direct modifications or made commits made locally.
250
+ A tracking branch can usually be identified as the
251
+ right-hand-side ref in a Pull: refspec.
252
+
253
tree object::
254
An object containing a list of file names and modes along with refs
255
to the associated blob and/or tree objects. A tree is equivalent
Documentation/sort_glossary.pl
+1
-1
@@ -48,7 +48,7 @@ This list is sorted alphabetically:
48
';
49
50
@keys=sort {uc($a) cmp uc($b)} keys %terms;
51
-$pattern='(\b'.join('\b|\b',reverse @keys).'\b)';
51
+$pattern='(\b(?<!link:git-)'.join('\b|\b(?<!link:git-)',reverse @keys).'\b)';
52
foreach $key (@keys) {
53
$terms{$key}=~s/$pattern/sprintf "<<ref_".no_spaces($1).",$1>>";/eg;
54
print '[[ref_'.no_spaces($key).']]'.$key."::\n"