Permalink
Browse files

Autogenerated HTML docs for v1.7.7-rc0-70-g82660

  • Loading branch information...
Junio C Hamano
Junio C Hamano committed Aug 29, 2011
1 parent d8fa022 commit 6e41cb3e3fed66e67c91f92710be792ee001702a
Showing with 95 additions and 77 deletions.
  1. +24 −1 RelNotes/1.7.7.txt
  2. +3 −2 git-branch.html
  3. +2 −1 git-branch.txt
  4. +3 −3 git-fast-import.html
  5. +2 −2 git-fast-import.txt
  6. +3 −1 git-http-fetch.html
  7. +3 −0 git-http-fetch.txt
  8. +28 −36 gitrepository-layout.html
  9. +27 −31 gitrepository-layout.txt
View
@@ -8,7 +8,7 @@ Updates since v1.7.6
* Interix, Cygwin and Minix ports got updated.
- * A handful of patches to update git-p4 (in contrib/).
+ * Various updates git-p4 (in contrib/) and "git fast-import".
* Gitweb learned to read from /etc/gitweb-common.conf when it exists,
before reading from gitweb_config.perl or from /etc/gitweb.conf
@@ -24,6 +24,10 @@ Updates since v1.7.6
Android with 4kb window). We used to reject anything that was not
deflated with 32kb window.
+ * Interaction between the use of pager and coloring of the output has
+ been improved, especially when a command that is not built-in was
+ involved.
+
* "git am" learned to pass "--exclude=<path>" option through to underlying
"git apply".
@@ -37,6 +41,9 @@ Updates since v1.7.6
you perform per each iteration does not need a working tree, of
course).
+ * The length of abbreviated object names in "git branch -v" output
+ now honors core.abbrev configuration variable.
+
* "git check-attr" can take relative paths from the command line.
* "git check-attr" learned "--all" option to list the attributes for a
@@ -73,6 +80,9 @@ Updates since v1.7.6
* "git grep" learned "-W" option that shows wider context using the same
logic used by "git diff" to determine the hunk header.
+ * The "--decorate" option to "git log" and its family learned to
+ highlight grafted and replaced commits.
+
* "git rebase master topci" no longer spews usage hints after giving
"fatal: no such branch: topci" error message.
@@ -106,6 +116,19 @@ included in this release.
* "git branch --set-upstream @{-1} foo" did not expand @{-1} correctly.
(merge e9d4f74 mg/branch-set-upstream-previous later to 'maint').
+ * "git branch -m" and "git checkout -b" incorrectly allowed the tip
+ of the branch that is currently checked out updated.
+ (merge 55c4a67 ci/forbid-unwanted-current-branch-update later to 'maint').
+
+ * "git clone" failed to clone locally from a ".git" file that itself
+ is not a directory but is a pointer to one.
+ (merge 9b0ebc7 nd/maint-clone-gitdir later to 'maint').
+
+ * "git clone" from a local repository that borrows from another
+ object store using a relative path in its objects/info/alternates
+ file did not adjust the alternates in the resulting repository.
+ (merge e6baf4a1 jc/maint-clone-alternates later to 'maint').
+
* "git describe --dirty" did not refresh the index before checking the
state of the working tree files.
(cherry-pick bb57148 ac/describe-dirty-refresh later to 'maint').
View
@@ -577,7 +577,8 @@ <h2 id="_options">OPTIONS</h2>
<dd>
<p>
Alter the sha1&#8217;s minimum display length in the output listing.
- The default value is 7.
+ The default value is 7 and can be overridden by the <tt>core.abbrev</tt>
+ config option.
</p>
</dd>
<dt class="hdlist1">
@@ -790,7 +791,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-03-15 23:30:13 UTC
+Last updated 2011-08-29 07:12:17 UTC
</div>
</div>
</body>
View
@@ -113,7 +113,8 @@ OPTIONS
--abbrev=<length>::
Alter the sha1's minimum display length in the output listing.
- The default value is 7.
+ The default value is 7 and can be overridden by the `core.abbrev`
+ config option.
--no-abbrev::
Display the full sha1s in the output listing rather than abbreviating them.
View
@@ -948,8 +948,8 @@ <h4 id="_tt_committer_tt"><tt>committer</tt></h4>
(&#8220;<a href="mailto:cm@example.com">cm@example.com</a>&#8221;). <tt>LT</tt> and <tt>GT</tt> are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that
-<tt>&lt;name&gt;</tt> is free-form and may contain any sequence of bytes, except
-<tt>LT</tt> and <tt>LF</tt>. It is typically UTF-8 encoded.</p></div>
+<tt>&lt;name&gt;</tt> and <tt>&lt;email&gt;</tt> are free-form and may contain any sequence
+of bytes, except <tt>LT</tt>, <tt>GT</tt> and <tt>LF</tt>. <tt>&lt;name&gt;</tt> is typically UTF-8 encoded.</p></div>
<div class="paragraph"><p>The time of the change is specified by <tt>&lt;when&gt;</tt> using the date format
that was selected by the --date-format=&lt;fmt&gt; command line option.
See &#8220;Date Formats&#8221; above for the set of supported formats, and
@@ -1956,7 +1956,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-08-26 16:16:25 UTC
+Last updated 2011-08-29 07:12:17 UTC
</div>
</div>
</body>
View
@@ -425,8 +425,8 @@ Here `<name>` is the person's display name (for example
(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c)
and greater-than (\x3e) symbols. These are required to delimit
the email address from the other fields in the line. Note that
-`<name>` is free-form and may contain any sequence of bytes, except
-`LT` and `LF`. It is typically UTF-8 encoded.
+`<name>` and `<email>` are free-form and may contain any sequence
+of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded.
The time of the change is specified by `<when>` using the date format
that was selected by the \--date-format=<fmt> command line option.
View
@@ -422,6 +422,8 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Downloads a remote git repository via HTTP.</p></div>
+<div class="paragraph"><p><strong>NOTE</strong>: use of this command without -a is deprecated. The -a
+behaviour will become the default in a future release.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
@@ -506,7 +508,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-07-23 00:49:30 UTC
+Last updated 2011-08-29 07:12:17 UTC
</div>
</div>
</body>
View
@@ -15,6 +15,9 @@ DESCRIPTION
-----------
Downloads a remote git repository via HTTP.
+*NOTE*: use of this command without -a is deprecated. The -a
+behaviour will become the default in a future release.
+
OPTIONS
-------
commit-id::
View
@@ -433,35 +433,24 @@ <h2 id="_description">DESCRIPTION</h2>
Object store associated with this repository. Usually
an object store is self sufficient (i.e. all the objects
that are referred to by an object found in it are also
- found in it), but there are couple of ways to violate
- it.
+ found in it), but there are a few ways to violate it.
</p>
<div class="olist arabic"><ol class="arabic">
<li>
<p>
-You could populate the repository by running a commit walker
-without <tt>-a</tt> option. Depending on which options are given, you
-could have only commit objects without associated blobs and
-trees this way, for example. A repository with this kind of
-incomplete object store is not suitable to be published to the
-outside world but sometimes useful for private repository.
+You could have an incomplete but locally usable repository
+by creating a shallow clone. See <a href="git-clone.html">git-clone(1)</a>.
</p>
</li>
<li>
<p>
-You also could have an incomplete but locally usable repository
-by cloning shallowly. See <a href="git-clone.html">git-clone(1)</a>.
-</p>
-</li>
-<li>
-<p>
-You can be using <tt>objects/info/alternates</tt> mechanism, or
-<tt>$GIT_ALTERNATE_OBJECT_DIRECTORIES</tt> mechanism to <em>borrow</em>
+You could be using the <tt>objects/info/alternates</tt> or
+<tt>$GIT_ALTERNATE_OBJECT_DIRECTORIES</tt> mechanisms to <em>borrow</em>
objects from other object stores. A repository with this kind
of incomplete object store is not suitable to be published for
use with dumb transports but otherwise is OK as long as
-<tt>objects/info/alternates</tt> points at the right object stores
-it borrows from.
+<tt>objects/info/alternates</tt> points at the object stores it
+borrows from.
</p>
</li>
</ol></div>
@@ -471,12 +460,12 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- Traditionally, each object is stored in its own file.
- They are split into 256 subdirectories using the first
- two letters from its object name to keep the number of
- directory entries <tt>objects</tt> directory itself needs to
- hold. Objects found here are often called <em>unpacked</em>
- (or <em>loose</em>) objects.
+ A newly created object is stored in its own file.
+ The objects are splayed over 256 subdirectories using
+ the first two characters of the sha1 object name to
+ keep the number of directory entries in <tt>objects</tt>
+ itself to a manageable number. Objects found
+ here are often called <em>unpacked</em> (or <em>loose</em>) objects.
</p>
</dd>
<dt class="hdlist1">
@@ -543,7 +532,7 @@ <h2 id="_description">DESCRIPTION</h2>
<dd>
<p>
References are stored in subdirectories of this
- directory. The <em>git prune</em> command knows to keep
+ directory. The <em>git prune</em> command knows to preserve
objects reachable from refs found in this directory and
its subdirectories.
</p>
@@ -602,20 +591,21 @@ <h2 id="_description">DESCRIPTION</h2>
</p>
<div class="paragraph"><p>HEAD can also record a specific commit directly, instead of
being a symref to point at the current branch. Such a state
-is often called <em>detached HEAD</em>, and almost all commands work
-identically as normal. See <a href="git-checkout.html">git-checkout(1)</a> for
-details.</p></div>
+is often called <em>detached HEAD.</em> See <a href="git-checkout.html">git-checkout(1)</a>
+for details.</p></div>
</dd>
<dt class="hdlist1">
branches
</dt>
<dd>
<p>
A slightly deprecated way to store shorthands to be used
- to specify URL to <em>git fetch</em>, <em>git pull</em> and <em>git push</em>
- commands is to store a file in <tt>branches/&lt;name&gt;</tt> and
- give <em>name</em> to these commands in place of <em>repository</em>
- argument.
+ to specify a URL to <em>git fetch</em>, <em>git pull</em> and <em>git push</em>.
+ A file can be stored as <tt>branches/&lt;name&gt;</tt> and then
+ <em>name</em> can be given to these commands in place of
+ <em>repository</em> argument. See the REMOTES section in
+ <a href="git-fetch.html">git-fetch(1)</a> for details. This mechanism is legacy
+ and not likely to be found in modern repositories.
</p>
</dd>
<dt class="hdlist1">
@@ -695,9 +685,11 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- Stores shorthands to be used to give URL and default
- refnames to interact with remote repository to
- <em>git fetch</em>, <em>git pull</em> and <em>git push</em> commands.
+ Stores shorthands for URL and default refnames for use
+ when interacting with remote repositories via <em>git fetch</em>,
+ <em>git pull</em> and <em>git push</em> commands. See the REMOTES section
+ in <a href="git-fetch.html">git-fetch(1)</a> for details. This mechanism is legacy
+ and not likely to be found in modern repositories.
</p>
</dd>
<dt class="hdlist1">
@@ -755,7 +747,7 @@ <h2 id="_git">GIT</h2>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-08-18 22:14:44 UTC
+Last updated 2011-08-29 07:12:17 UTC
</div>
</div>
</body>
View
@@ -23,32 +23,25 @@ objects::
Object store associated with this repository. Usually
an object store is self sufficient (i.e. all the objects
that are referred to by an object found in it are also
- found in it), but there are couple of ways to violate
- it.
+ found in it), but there are a few ways to violate it.
+
-. You could populate the repository by running a commit walker
-without `-a` option. Depending on which options are given, you
-could have only commit objects without associated blobs and
-trees this way, for example. A repository with this kind of
-incomplete object store is not suitable to be published to the
-outside world but sometimes useful for private repository.
-. You also could have an incomplete but locally usable repository
-by cloning shallowly. See linkgit:git-clone[1].
-. You can be using `objects/info/alternates` mechanism, or
-`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanism to 'borrow'
+. You could have an incomplete but locally usable repository
+by creating a shallow clone. See linkgit:git-clone[1].
+. You could be using the `objects/info/alternates` or
+`$GIT_ALTERNATE_OBJECT_DIRECTORIES` mechanisms to 'borrow'
objects from other object stores. A repository with this kind
of incomplete object store is not suitable to be published for
use with dumb transports but otherwise is OK as long as
-`objects/info/alternates` points at the right object stores
-it borrows from.
+`objects/info/alternates` points at the object stores it
+borrows from.
objects/[0-9a-f][0-9a-f]::
- Traditionally, each object is stored in its own file.
- They are split into 256 subdirectories using the first
- two letters from its object name to keep the number of
- directory entries `objects` directory itself needs to
- hold. Objects found here are often called 'unpacked'
- (or 'loose') objects.
+ A newly created object is stored in its own file.
+ The objects are splayed over 256 subdirectories using
+ the first two characters of the sha1 object name to
+ keep the number of directory entries in `objects`
+ itself to a manageable number. Objects found
+ here are often called 'unpacked' (or 'loose') objects.
objects/pack::
Packs (files that store many object in compressed form,
@@ -85,7 +78,7 @@ objects/info/http-alternates::
refs::
References are stored in subdirectories of this
- directory. The 'git prune' command knows to keep
+ directory. The 'git prune' command knows to preserve
objects reachable from refs found in this directory and
its subdirectories.
@@ -119,16 +112,17 @@ HEAD::
+
HEAD can also record a specific commit directly, instead of
being a symref to point at the current branch. Such a state
-is often called 'detached HEAD', and almost all commands work
-identically as normal. See linkgit:git-checkout[1] for
-details.
+is often called 'detached HEAD.' See linkgit:git-checkout[1]
+for details.
branches::
A slightly deprecated way to store shorthands to be used
- to specify URL to 'git fetch', 'git pull' and 'git push'
- commands is to store a file in `branches/<name>` and
- give 'name' to these commands in place of 'repository'
- argument.
+ to specify a URL to 'git fetch', 'git pull' and 'git push'.
+ A file can be stored as `branches/<name>` and then
+ 'name' can be given to these commands in place of
+ 'repository' argument. See the REMOTES section in
+ linkgit:git-fetch[1] for details. This mechanism is legacy
+ and not likely to be found in modern repositories.
hooks::
Hooks are customization scripts used by various git
@@ -173,9 +167,11 @@ info/exclude::
at it. See also: linkgit:gitignore[5].
remotes::
- Stores shorthands to be used to give URL and default
- refnames to interact with remote repository to
- 'git fetch', 'git pull' and 'git push' commands.
+ Stores shorthands for URL and default refnames for use
+ when interacting with remote repositories via 'git fetch',
+ 'git pull' and 'git push' commands. See the REMOTES section
+ in linkgit:git-fetch[1] for details. This mechanism is legacy
+ and not likely to be found in modern repositories.
logs::
Records of changes made to refs are stored in this

0 comments on commit 6e41cb3

Please sign in to comment.