Skip to content

Commit 88a3a07

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.3.2-g5892
1 parent 46338f5 commit 88a3a07

File tree

7 files changed

+420
-192
lines changed

7 files changed

+420
-192
lines changed

config.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,11 @@ core.ignoreStat::
6464
slow, such as Microsoft Windows. See gitlink:git-update-index[1].
6565
False by default.
6666

67-
core.onlyUseSymrefs::
68-
Always use the "symref" format instead of symbolic links for HEAD
69-
and other symbolic reference files. True by default.
67+
core.preferSymlinkRefs::
68+
Instead of the default "symref" format for HEAD
69+
and other symbolic reference files, use symbolic links.
70+
This is sometimes needed to work with old scripts that
71+
expect HEAD to be a symbolic link.
7072

7173
core.repositoryFormatVersion::
7274
Internal variable identifying the repository format and layout

git-count-objects.html

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,13 +272,29 @@ <h2>NAME</h2>
272272
</div>
273273
<h2>SYNOPSIS</h2>
274274
<div class="sectionbody">
275-
<p><em>git-count-objects</em></p>
275+
<p><em>git-count-objects</em> [-v]</p>
276276
</div>
277277
<h2>DESCRIPTION</h2>
278278
<div class="sectionbody">
279279
<p>This counts the number of unpacked object files and disk space consumed by
280280
them, to help you decide when it is a good time to repack.</p>
281281
</div>
282+
<h2>OPTIONS</h2>
283+
<div class="sectionbody">
284+
<dl>
285+
<dt>
286+
-v
287+
</dt>
288+
<dd>
289+
<p>
290+
In addition to the number of loose objects and disk
291+
space consumed, it reports the number of in-pack
292+
objects, and number of objects that can be removed by
293+
running <tt>git-prune-packed</tt>.
294+
</p>
295+
</dd>
296+
</dl>
297+
</div>
282298
<h2>Author</h2>
283299
<div class="sectionbody">
284300
<p>Written by Junio C Hamano &lt;junkio@cox.net&gt;</p>
@@ -293,7 +309,7 @@ <h2>GIT</h2>
293309
</div>
294310
<div id="footer">
295311
<div id="footer-text">
296-
Last updated 10-Mar-2006 00:31:23 UTC
312+
Last updated 04-May-2006 08:01:36 UTC
297313
</div>
298314
</div>
299315
</body>

git-count-objects.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,23 @@ git-count-objects - Reports on unpacked objects
77

88
SYNOPSIS
99
--------
10-
'git-count-objects'
10+
'git-count-objects' [-v]
1111

1212
DESCRIPTION
1313
-----------
1414
This counts the number of unpacked object files and disk space consumed by
1515
them, to help you decide when it is a good time to repack.
1616

17+
18+
OPTIONS
19+
-------
20+
-v::
21+
In addition to the number of loose objects and disk
22+
space consumed, it reports the number of in-pack
23+
objects, and number of objects that can be removed by
24+
running `git-prune-packed`.
25+
26+
1727
Author
1828
------
1929
Written by Junio C Hamano <junkio@cox.net>

git-repo-config.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ <h2>OPTIONS</h2>
338338
<dd>
339339
<p>
340340
Default behaviour is to replace at most one line. This replaces
341-
all lines matching the key (and optionally the value_regex)
341+
all lines matching the key (and optionally the value_regex).
342342
</p>
343343
</dd>
344344
<dt>
@@ -360,6 +360,14 @@ <h2>OPTIONS</h2>
360360
</p>
361361
</dd>
362362
<dt>
363+
--get-regexp
364+
</dt>
365+
<dd>
366+
<p>
367+
Like --get-all, but interprets the name as a regular expression.
368+
</p>
369+
</dd>
370+
<dt>
363371
--unset
364372
</dt>
365373
<dd>
@@ -558,12 +566,14 @@ <h3>Variables</h3>
558566
</p>
559567
</dd>
560568
<dt>
561-
core.onlyUseSymrefs
569+
core.preferSymlinkRefs
562570
</dt>
563571
<dd>
564572
<p>
565-
Always use the "symref" format instead of symbolic links for HEAD
566-
and other symbolic reference files. True by default.
573+
Instead of the default "symref" format for HEAD
574+
and other symbolic reference files, use symbolic links.
575+
This is sometimes needed to work with old scripts that
576+
expect HEAD to be a symbolic link.
567577
</p>
568578
</dd>
569579
<dt>
@@ -819,7 +829,7 @@ <h2>GIT</h2>
819829
</div>
820830
<div id="footer">
821831
<div id="footer-text">
822-
Last updated 27-Apr-2006 20:10:38 UTC
832+
Last updated 04-May-2006 08:01:37 UTC
823833
</div>
824834
</div>
825835
</body>

git-repo-config.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ OPTIONS
4949

5050
--replace-all::
5151
Default behaviour is to replace at most one line. This replaces
52-
all lines matching the key (and optionally the value_regex)
52+
all lines matching the key (and optionally the value_regex).
5353

5454
--get::
5555
Get the value for a given key (optionally filtered by a regex
@@ -59,6 +59,9 @@ OPTIONS
5959
Like get, but does not fail if the number of values for the key
6060
is not exactly one.
6161

62+
--get-regexp::
63+
Like --get-all, but interprets the name as a regular expression.
64+
6265
--unset::
6366
Remove the line matching the key from .git/config.
6467

glossary.html

Lines changed: 126 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
6-
<meta name="generator" content="AsciiDoc 7.0.1" />
6+
<meta name="generator" content="AsciiDoc 7.0.2" />
77
<style type="text/css">
88
/* Debug borders */
99
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -276,6 +276,22 @@ <h1>GIT Glossary</h1>
276276
</p>
277277
</dd>
278278
<dt>
279+
<a id="ref_bare_repository"></a>bare repository
280+
</dt>
281+
<dd>
282+
<p>
283+
A <a href="#ref_bare_repository">bare repository</a> is normally an appropriately
284+
named <a href="#ref_directory">directory</a> with a <tt>.git</tt> suffix that does not
285+
have a locally checked-out copy of any of the files under
286+
<a href="#ref_revision">revision</a> control. That is, all of the <tt>git</tt>
287+
administrative and control files that would normally be present in the
288+
hidden <tt>.git</tt> sub-<a href="#ref_directory">directory</a> are directly present in
289+
the <tt><a href="#ref_repository">repository</a>.git</tt> <a href="#ref_directory">directory</a>
290+
instead, and no other files are present and checked out. Usually
291+
publishers of public repositories make bare repositories available.
292+
</p>
293+
</dd>
294+
<dt>
279295
<a id="ref_blob_object"></a>blob object
280296
</dt>
281297
<dd>
@@ -333,13 +349,26 @@ <h1>GIT Glossary</h1>
333349
</p>
334350
</dd>
335351
<dt>
352+
<a id="ref_cherry-picking"></a>cherry-picking
353+
</dt>
354+
<dd>
355+
<p>
356+
In <a href="#ref_SCM">SCM</a> jargon, "cherry pick" means to choose a subset of
357+
changes out of a series of changes (typically commits) and record them
358+
as a new series of changes on top of different codebase. In GIT, this is
359+
performed by "git cherry-pick" command to extract the change introduced
360+
by an existing <a href="#ref_commit">commit</a> and to record it based on the tip
361+
of the current <a href="#ref_branch">branch</a> as a new <a href="#ref_commit">commit</a>.
362+
</p>
363+
</dd>
364+
<dt>
336365
<a id="ref_clean"></a>clean
337366
</dt>
338367
<dd>
339368
<p>
340369
A <a href="#ref_working_tree">working tree</a> is <a href="#ref_clean">clean</a>, if it
341370
corresponds to the <a href="#ref_revision">revision</a> referenced by the current
342-
<a href="#ref_head">head</a>.
371+
<a href="#ref_head">head</a>. Also see "<a href="#ref_dirty">dirty</a>".
343372
</p>
344373
</dd>
345374
<dt>
@@ -423,6 +452,21 @@ <h1>GIT Glossary</h1>
423452
</p>
424453
</dd>
425454
<dt>
455+
<a id="ref_fast_forward"></a>fast forward
456+
</dt>
457+
<dd>
458+
<p>
459+
A fast-forward is a special type of <a href="#ref_merge">merge</a> where you have a
460+
<a href="#ref_revision">revision</a> and you are "merging" another
461+
<a href="#ref_branch">branch</a>'s changes that happen to be a descendant of what
462+
you have. In such these cases, you do not make a new <a href="#ref_merge">merge</a>
463+
<a href="#ref_commit">commit</a> but instead just update to his
464+
<a href="#ref_revision">revision</a>. This will happen frequently on a
465+
<a href="#ref_tracking_branch">tracking branch</a> of a remote
466+
<a href="#ref_repository">repository</a>.
467+
</p>
468+
</dd>
469+
<dt>
426470
<a id="ref_fetch"></a>fetch
427471
</dt>
428472
<dd>
@@ -480,6 +524,20 @@ <h1>GIT Glossary</h1>
480524
</p>
481525
</dd>
482526
<dt>
527+
<a id="ref_hook"></a>hook
528+
</dt>
529+
<dd>
530+
<p>
531+
During the normal execution of several git commands, call-outs are made
532+
to optional scripts that allow a developer to add functionality or
533+
checking. Typically, the hooks allow for a command to be pre-verified
534+
and potentially aborted, and allow for a post-notification after the
535+
operation is done. The <a href="#ref_hook">hook</a> scripts are found in the
536+
<tt>$GIT_DIR/hooks/</tt> <a href="#ref_directory">directory</a>, and are enabled by simply
537+
making them executable.
538+
</p>
539+
</dd>
540+
<dt>
483541
<a id="ref_index"></a>index
484542
</dt>
485543
<dd>
@@ -507,11 +565,11 @@ <h1>GIT Glossary</h1>
507565
</dt>
508566
<dd>
509567
<p>
510-
The default <a href="#ref_branch">branch</a>. Whenever you create a git
568+
The default development <a href="#ref_branch">branch</a>. Whenever you create a git
511569
<a href="#ref_repository">repository</a>, a <a href="#ref_branch">branch</a> named
512570
"<a href="#ref_master">master</a>" is created, and becomes the active
513571
<a href="#ref_branch">branch</a>. In most cases, this contains the local
514-
development.
572+
development, though that is purely conventional and not required.
515573
</p>
516574
</dd>
517575
<dt>
@@ -580,11 +638,11 @@ <h1>GIT Glossary</h1>
580638
</dt>
581639
<dd>
582640
<p>
583-
The default upstream <a href="#ref_branch">branch</a>. Most projects have one
584-
upstream project which they track, and by default
585-
<em><a href="#ref_origin">origin</a></em> is used for that purpose. New updates from
586-
upstream will be fetched into this <a href="#ref_branch">branch</a>; you should
587-
never <a href="#ref_commit">commit</a> to it yourself.
641+
The default upstream <a href="#ref_tracking_branch">tracking branch</a>. Most
642+
projects have at least one upstream project which they track. By default
643+
<em><a href="#ref_origin">origin</a></em> is used for that purpose. New upstream updates
644+
will be fetched into this <a href="#ref_branch">branch</a>; you should never
645+
<a href="#ref_commit">commit</a> to it yourself.
588646
</p>
589647
</dd>
590648
<dt>
@@ -617,6 +675,18 @@ <h1>GIT Glossary</h1>
617675
</p>
618676
</dd>
619677
<dt>
678+
<a id="ref_pickaxe"></a>pickaxe
679+
</dt>
680+
<dd>
681+
<p>
682+
The term <a href="#ref_pickaxe">pickaxe</a> refers to an option to the diffcore
683+
routines that help select changes that add or delete a given text
684+
string. With the &#8212;<a href="#ref_pickaxe">pickaxe</a>-all option, it can be used to
685+
view the full <a href="#ref_changeset">changeset</a> that introduced or removed,
686+
say, a particular line of text. See <a href="git-diff.html">git-diff(1)</a>.
687+
</p>
688+
</dd>
689+
<dt>
620690
<a id="ref_plumbing"></a>plumbing
621691
</dt>
622692
<dd>
@@ -687,12 +757,32 @@ <h1>GIT Glossary</h1>
687757
</dt>
688758
<dd>
689759
<p>
690-
A 40-byte hex representation of a <a href="#ref_SHA1">SHA1</a> pointing to a
691-
particular <a href="#ref_object">object</a>. These may be stored in
760+
A 40-byte hex representation of a <a href="#ref_SHA1">SHA1</a> or a name that
761+
denotes a particular <a href="#ref_object">object</a>. These may be stored in
692762
<tt>$GIT_DIR/refs/</tt>.
693763
</p>
694764
</dd>
695765
<dt>
766+
<a id="ref_refspec"></a>refspec
767+
</dt>
768+
<dd>
769+
<p>
770+
A <a href="#ref_refspec">refspec</a> is used by <a href="#ref_fetch">fetch</a> and
771+
<a href="#ref_push">push</a> to describe the mapping between remote <a href="#ref_ref">ref</a>
772+
and local <a href="#ref_ref">ref</a>. They are combined with a colon in the format
773+
&lt;src&gt;:&lt;dst&gt;, preceded by an optional plus sign, +. For example: <tt>git
774+
<a href="#ref_fetch">fetch</a> $URL
775+
refs/heads/<a href="#ref_master">master</a>:refs/heads/<a href="#ref_origin">origin</a></tt> means
776+
"grab the <a href="#ref_master">master</a> <a href="#ref_branch">branch</a> <a href="#ref_head">head</a>
777+
from the $URL and store it as my <a href="#ref_origin">origin</a>
778+
<a href="#ref_branch">branch</a> <a href="#ref_head">head</a>". And <tt>git <a href="#ref_push">push</a>
779+
$URL refs/heads/<a href="#ref_master">master</a>:refs/heads/to-upstream</tt> means
780+
"publish my <a href="#ref_master">master</a> <a href="#ref_branch">branch</a>
781+
<a href="#ref_head">head</a> as to-upstream <a href="#ref_master">master</a> <a href="#ref_head">head</a>
782+
at $URL". See also <a href="git-push.html">git-push(1)</a>
783+
</p>
784+
</dd>
785+
<dt>
696786
<a id="ref_repository"></a>repository
697787
</dt>
698788
<dd>
@@ -774,6 +864,30 @@ <h1>GIT Glossary</h1>
774864
</p>
775865
</dd>
776866
<dt>
867+
<a id="ref_topic_branch"></a>topic branch
868+
</dt>
869+
<dd>
870+
<p>
871+
A regular git <a href="#ref_branch">branch</a> that is used by a developer to
872+
identify a conceptual line of development. Since branches are very easy
873+
and inexpensive, it is often desirable to have several small branches
874+
that each contain very well defined concepts or small incremental yet
875+
related changes.
876+
</p>
877+
</dd>
878+
<dt>
879+
<a id="ref_tracking_branch"></a>tracking branch
880+
</dt>
881+
<dd>
882+
<p>
883+
A regular git <a href="#ref_branch">branch</a> that is used to follow changes from
884+
another <a href="#ref_repository">repository</a>. A <a href="#ref_tracking_branch">tracking branch</a> should not contain direct modifications or have local commits
885+
made to it. A <a href="#ref_tracking_branch">tracking branch</a> can usually be
886+
identified as the right-hand-side <a href="#ref_ref">ref</a> in a Pull:
887+
<a href="#ref_refspec">refspec</a>.
888+
</p>
889+
</dd>
890+
<dt>
777891
<a id="ref_tree"></a>tree
778892
</dt>
779893
<dd>
@@ -824,7 +938,7 @@ <h2>GIT</h2>
824938
</div>
825939
<div id="footer">
826940
<div id="footer-text">
827-
Last updated 10-Jan-2006 16:53:50 PDT
941+
Last updated 04-May-2006 08:01:37 UTC
828942
</div>
829943
</div>
830944
</body>

0 commit comments

Comments
 (0)