Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Autogenerated HTML docs for v1.8.2.1-538-gad776

  • Loading branch information...
commit e3f080d1c1d091db97eb840de39a5245a3c82f3e 1 parent 7692782
@gitster authored
Showing with 396 additions and 321 deletions.
  1. +1 −1  config.txt
  2. +4 −4 git-cat-file.html
  3. +3 −3 git-cat-file.txt
  4. +1 −1  git-config.html
  5. +2 −2 git-describe.html
  6. +1 −1  git-describe.txt
  7. +1 −1  git-diff-tree.html
  8. +3 −3 git-fsck.html
  9. +2 −2 git-fsck.txt
  10. +82 −2 git-http-backend.html
  11. +81 −1 git-http-backend.txt
  12. +2 −2 git-index-pack.html
  13. +1 −1  git-index-pack.txt
  14. +1 −1  git-log.html
  15. +2 −2 git-ls-files.html
  16. +1 −1  git-ls-files.txt
  17. +2 −2 git-merge-index.html
  18. +1 −1  git-merge-index.txt
  19. +2 −2 git-pack-objects.html
  20. +1 −1  git-pack-objects.txt
  21. +2 −2 git-patch-id.html
  22. +1 −1  git-patch-id.txt
  23. +3 −3 git-replace.html
  24. +2 −2 git-replace.txt
  25. +1 −1  git-rev-list.html
  26. +5 −5 git-rev-parse.html
  27. +2 −2 git-rev-parse.txt
  28. +3 −3 git-show-branch.html
  29. +2 −2 git-show-branch.txt
  30. +2 −2 git-show-index.html
  31. +1 −1  git-show-index.txt
  32. +3 −3 git-show-ref.html
  33. +2 −2 git-show-ref.txt
  34. +1 −1  git-show.html
  35. +2 −2 git-tag.html
  36. +1 −1  git-tag.txt
  37. +2 −2 git-update-index.html
  38. +1 −1  git-update-index.txt
  39. +3 −3 git-verify-pack.html
  40. +2 −2 git-verify-pack.txt
  41. +2 −2 git-verify-tag.html
  42. +1 −1  git-verify-tag.txt
  43. +1 −1  git-whatchanged.html
  44. +6 −6 git.html
  45. +5 −5 git.txt
  46. +5 −5 gitcore-tutorial.html
  47. +4 −4 gitcore-tutorial.txt
  48. +2 −2 gitdiffcore.html
  49. +1 −1  gitdiffcore.txt
  50. +22 −61 gitglossary.html
  51. +6 −6 githooks.html
  52. +5 −5 githooks.txt
  53. +2 −2 gitrepository-layout.html
  54. +1 −1  gitrepository-layout.txt
  55. +2 −2 gitrevisions.html
  56. +9 −9 gittutorial-2.html
  57. +8 −8 gittutorial-2.txt
  58. +21 −43 glossary-content.txt
  59. +4 −4 howto/recover-corrupted-blob-object.html
  60. +3 −3 howto/recover-corrupted-blob-object.txt
  61. +1 −1  pretty-formats.txt
  62. +2 −2 revisions.txt
  63. +3 −3 technical/api-sha1-array.html
  64. +2 −2 technical/api-sha1-array.txt
  65. +8 −8 technical/pack-format.html
  66. +7 −7 technical/pack-format.txt
  67. +2 −2 technical/pack-heuristics.html
  68. +1 −1  technical/pack-heuristics.txt
  69. +3 −3 technical/shallow.html
  70. +2 −2 technical/shallow.txt
  71. +20 −44 user-manual.html
View
2  config.txt
@@ -412,7 +412,7 @@ repository's usual working tree).
core.logAllRefUpdates::
Enable the reflog. Updates to a ref <ref> is logged to the file
"$GIT_DIR/logs/<ref>", by appending the new and old
- SHA1, the date/time and the reason of the update, but
+ SHA-1, the date/time and the reason of the update, but
only when the file exists. If this configuration
variable is set to true, missing "$GIT_DIR/logs/<ref>"
file is automatically created for branch heads (i.e. under
View
8 git-cat-file.html
@@ -760,7 +760,7 @@ <h2 id="_description">DESCRIPTION</h2>
object type, or <em>-s</em> is used to find the object size, or <em>--textconv</em> is used
(which implies type "blob").</p></div>
<div class="paragraph"><p>In the second form, a list of objects (separated by linefeeds) is provided on
-stdin, and the SHA1, type, and size of each object is printed on stdout.</p></div>
+stdin, and the SHA-1, type, and size of each object is printed on stdout.</p></div>
</div>
</div>
<div class="sect1">
@@ -840,7 +840,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Print the SHA1, type, size, and contents of each object provided on
+ Print the SHA-1, type, size, and contents of each object provided on
stdin. May not be combined with any other options or arguments.
</p>
</dd>
@@ -849,7 +849,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Print the SHA1, type, and size of each object provided on stdin. May not
+ Print the SHA-1, type, and size of each object provided on stdin. May not
be combined with any other options or arguments.
</p>
</dd>
@@ -896,7 +896,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
6 git-cat-file.txt
@@ -20,7 +20,7 @@ object type, or '-s' is used to find the object size, or '--textconv' is used
(which implies type "blob").
In the second form, a list of objects (separated by linefeeds) is provided on
-stdin, and the SHA1, type, and size of each object is printed on stdout.
+stdin, and the SHA-1, type, and size of each object is printed on stdout.
OPTIONS
-------
@@ -58,11 +58,11 @@ OPTIONS
to apply the filter to the content recorded in the index at <path>.
--batch::
- Print the SHA1, type, size, and contents of each object provided on
+ Print the SHA-1, type, size, and contents of each object provided on
stdin. May not be combined with any other options or arguments.
--batch-check::
- Print the SHA1, type, and size of each object provided on stdin. May not
+ Print the SHA-1, type, and size of each object provided on stdin. May not
be combined with any other options or arguments.
OUTPUT
View
2  git-config.html
@@ -1837,7 +1837,7 @@ <h3 id="_variables">Variables</h3>
<p>
Enable the reflog. Updates to a ref &lt;ref&gt; is logged to the file
"$GIT_DIR/logs/&lt;ref&gt;", by appending the new and old
- SHA1, the date/time and the reason of the update, but
+ SHA-1, the date/time and the reason of the update, but
only when the file exists. If this configuration
variable is set to true, missing "$GIT_DIR/logs/&lt;ref&gt;"
file is automatically created for branch heads (i.e. under
View
4 git-describe.html
@@ -958,7 +958,7 @@ <h2 id="_search_strategy">SEARCH STRATEGY</h2>
<div class="paragraph"><p>If an exact match was not found, <em>git describe</em> will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor&#8217;s tag will be output along with an
-abbreviation of the input committish&#8217;s SHA1.</p></div>
+abbreviation of the input committish&#8217;s SHA-1.</p></div>
<div class="paragraph"><p>If multiple tags were found during the walk then the tag which
has the fewest commits different from the input committish will be
selected and output. Here fewest commits different is defined as
@@ -976,7 +976,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-19 16:06:22 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-describe.txt
@@ -149,7 +149,7 @@ is found, its name will be output and searching will stop.
If an exact match was not found, 'git describe' will walk back
through the commit history to locate an ancestor commit which
has been tagged. The ancestor's tag will be output along with an
-abbreviation of the input committish's SHA1.
+abbreviation of the input committish's SHA-1.
If multiple tags were found during the walk then the tag which
has the fewest commits different from the input committish will be
View
2  git-diff-tree.html
@@ -1978,7 +1978,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
<em>raw</em>
</p>
<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
View
6 git-fsck.html
@@ -771,7 +771,7 @@ <h2 id="_options">OPTIONS</h2>
An object to treat as the head of an unreachability trace.
</p>
<div class="paragraph"><p>If no objects are given, <em>git fsck</em> defaults to using the
-index file, all SHA1 references in <code>refs</code> namespace, and all reflogs
+index file, all SHA-1 references in <code>refs</code> namespace, and all reflogs
(unless --no-reflogs is given) as heads.</p></div>
</dd>
<dt class="hdlist1">
@@ -899,7 +899,7 @@ <h2 id="_options">OPTIONS</h2>
<div class="sect1">
<h2 id="_discussion">DISCUSSION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>git-fsck tests SHA1 and general object sanity, and it does full tracking
+<div class="paragraph"><p>git-fsck tests SHA-1 and general object sanity, and it does full tracking
of the resulting reachability and everything else. It prints out any
corruption it finds (missing or bad objects), and if you use the
<em>--unreachable</em> flag it will also print out objects that exist but that
@@ -1017,7 +1017,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-fsck.txt
@@ -23,7 +23,7 @@ OPTIONS
An object to treat as the head of an unreachability trace.
+
If no objects are given, 'git fsck' defaults to using the
-index file, all SHA1 references in `refs` namespace, and all reflogs
+index file, all SHA-1 references in `refs` namespace, and all reflogs
(unless --no-reflogs is given) as heads.
--unreachable::
@@ -89,7 +89,7 @@ index file, all SHA1 references in `refs` namespace, and all reflogs
DISCUSSION
----------
-git-fsck tests SHA1 and general object sanity, and it does full tracking
+git-fsck tests SHA-1 and general object sanity, and it does full tracking
of the resulting reachability and everything else. It prints out any
corruption it finds (missing or bad objects), and if you use the
'--unreachable' flag it will also print out objects that exist but that
View
84 git-http-backend.html
@@ -847,7 +847,29 @@ <h2 id="_examples">EXAMPLES</h2>
ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/</code></pre>
</div></div>
<div class="paragraph"><p>To enable anonymous read access but authenticated write access,
-require authorization with a LocationMatch directive:</p></div>
+require authorization for both the initial ref advertisement (which we
+detect as a push via the service parameter in the query string), and the
+receive-pack invocation itself:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
+RewriteCond %{REQUEST_URI} /git-receive-pack$
+RewriteRule ^/git/ - [E=AUTHREQUIRED:yes]
+
+&lt;LocationMatch "^/git/"&gt;
+ Order Deny,Allow
+ Deny from env=AUTHREQUIRED
+
+ AuthType Basic
+ AuthName "Git Access"
+ Require group committers
+ Satisfy Any
+ ...
+&lt;/LocationMatch&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>If you do not have <code>mod_rewrite</code> available to match against the query
+string, it is sufficient to just protect <code>git-receive-pack</code> itself,
+like:</p></div>
<div class="listingblock">
<div class="content">
<pre><code>&lt;LocationMatch "^/git/.*/git-receive-pack$"&gt;
@@ -857,6 +879,14 @@ <h2 id="_examples">EXAMPLES</h2>
...
&lt;/LocationMatch&gt;</code></pre>
</div></div>
+<div class="paragraph"><p>In this mode, the server will not request authentication until the
+client actually starts the object negotiation phase of the push, rather
+than during the initial contact. For this reason, you must also enable
+the <code>http.receivepack</code> config option in any repositories that should
+accept a push. The default behavior, if <code>http.receivepack</code> is not set,
+is to reject any pushes by unauthenticated users; the initial request
+will therefore report <code>403 Forbidden</code> to the client, without even giving
+an opportunity for authentication.</p></div>
<div class="paragraph"><p>To require authentication for both reads and writes, use a Location
directive around the repository, or one of its parent directories:</p></div>
<div class="listingblock">
@@ -926,6 +956,56 @@ <h2 id="_examples">EXAMPLES</h2>
ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/</code></pre>
</div></div>
</dd>
+<dt class="hdlist1">
+Lighttpd
+</dt>
+<dd>
+<p>
+ Ensure that <code>mod_cgi</code>, <code>mod_alias, `mod_auth</code>, <code>mod_setenv</code> are
+ loaded, then set <code>GIT_PROJECT_ROOT</code> appropriately and redirect
+ all requests to the CGI:
+</p>
+<div class="listingblock">
+<div class="content">
+<pre><code>alias.url += ( "/git" =&gt; "/usr/lib/git-core/git-http-backend" )
+$HTTP["url"] =~ "^/git" {
+ cgi.assign = ("" =&gt; "")
+ setenv.add-environment = (
+ "GIT_PROJECT_ROOT" =&gt; "/var/www/git",
+ "GIT_HTTP_EXPORT_ALL" =&gt; ""
+ )
+}</code></pre>
+</div></div>
+<div class="paragraph"><p>To enable anonymous read access but authenticated write access:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>$HTTP["querystring"] =~ "service=git-receive-pack" {
+ include "git-auth.conf"
+}
+$HTTP["url"] =~ "^/git/.*/git-receive-pack$" {
+ include "git-auth.conf"
+}</code></pre>
+</div></div>
+<div class="paragraph"><p>where <code>git-auth.conf</code> looks something like:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>auth.require = (
+ "/" =&gt; (
+ "method" =&gt; "basic",
+ "realm" =&gt; "Git Access",
+ "require" =&gt; "valid-user"
+ )
+)
+# ...and set up auth.backend here</code></pre>
+</div></div>
+<div class="paragraph"><p>To require authentication for both reads and writes:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>$HTTP["url"] =~ "^/git/private" {
+ include "git-auth.conf"
+}</code></pre>
+</div></div>
+</dd>
</dl></div>
</div>
</div>
@@ -999,7 +1079,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
82 git-http-backend.txt
@@ -80,7 +80,30 @@ ScriptAlias /git/ /usr/libexec/git-core/git-http-backend/
----------------------------------------------------------------
+
To enable anonymous read access but authenticated write access,
-require authorization with a LocationMatch directive:
+require authorization for both the initial ref advertisement (which we
+detect as a push via the service parameter in the query string), and the
+receive-pack invocation itself:
++
+----------------------------------------------------------------
+RewriteCond %{QUERY_STRING} service=git-receive-pack [OR]
+RewriteCond %{REQUEST_URI} /git-receive-pack$
+RewriteRule ^/git/ - [E=AUTHREQUIRED:yes]
+
+<LocationMatch "^/git/">
+ Order Deny,Allow
+ Deny from env=AUTHREQUIRED
+
+ AuthType Basic
+ AuthName "Git Access"
+ Require group committers
+ Satisfy Any
+ ...
+</LocationMatch>
+----------------------------------------------------------------
++
+If you do not have `mod_rewrite` available to match against the query
+string, it is sufficient to just protect `git-receive-pack` itself,
+like:
+
----------------------------------------------------------------
<LocationMatch "^/git/.*/git-receive-pack$">
@@ -91,6 +114,15 @@ require authorization with a LocationMatch directive:
</LocationMatch>
----------------------------------------------------------------
+
+In this mode, the server will not request authentication until the
+client actually starts the object negotiation phase of the push, rather
+than during the initial contact. For this reason, you must also enable
+the `http.receivepack` config option in any repositories that should
+accept a push. The default behavior, if `http.receivepack` is not set,
+is to reject any pushes by unauthenticated users; the initial request
+will therefore report `403 Forbidden` to the client, without even giving
+an opportunity for authentication.
++
To require authentication for both reads and writes, use a Location
directive around the repository, or one of its parent directories:
+
@@ -158,6 +190,54 @@ ScriptAliasMatch \
ScriptAlias /git/ /var/www/cgi-bin/gitweb.cgi/
----------------------------------------------------------------
+Lighttpd::
+ Ensure that `mod_cgi`, `mod_alias, `mod_auth`, `mod_setenv` are
+ loaded, then set `GIT_PROJECT_ROOT` appropriately and redirect
+ all requests to the CGI:
++
+----------------------------------------------------------------
+alias.url += ( "/git" => "/usr/lib/git-core/git-http-backend" )
+$HTTP["url"] =~ "^/git" {
+ cgi.assign = ("" => "")
+ setenv.add-environment = (
+ "GIT_PROJECT_ROOT" => "/var/www/git",
+ "GIT_HTTP_EXPORT_ALL" => ""
+ )
+}
+----------------------------------------------------------------
++
+To enable anonymous read access but authenticated write access:
++
+----------------------------------------------------------------
+$HTTP["querystring"] =~ "service=git-receive-pack" {
+ include "git-auth.conf"
+}
+$HTTP["url"] =~ "^/git/.*/git-receive-pack$" {
+ include "git-auth.conf"
+}
+----------------------------------------------------------------
++
+where `git-auth.conf` looks something like:
++
+----------------------------------------------------------------
+auth.require = (
+ "/" => (
+ "method" => "basic",
+ "realm" => "Git Access",
+ "require" => "valid-user"
+ )
+)
+# ...and set up auth.backend here
+----------------------------------------------------------------
++
+To require authentication for both reads and writes:
++
+----------------------------------------------------------------
+$HTTP["url"] =~ "^/git/private" {
+ include "git-auth.conf"
+}
+----------------------------------------------------------------
+
ENVIRONMENT
-----------
View
4 git-index-pack.html
@@ -878,7 +878,7 @@ <h2 id="_options">OPTIONS</h2>
<h2 id="_note">Note</h2>
<div class="sectionbody">
<div class="paragraph"><p>Once the index has been created, the list of object names is sorted
-and the SHA1 hash of that list is printed to stdout. If --stdin was
+and the SHA-1 hash of that list is printed to stdout. If --stdin was
also used then this is prefixed by either "pack\t", or "keep\t" if a
new .keep file was successfully created. This is useful to remove a
.keep file used as a lock to prevent the race with <em>git repack</em>
@@ -895,7 +895,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-index-pack.txt
@@ -89,7 +89,7 @@ Note
----
Once the index has been created, the list of object names is sorted
-and the SHA1 hash of that list is printed to stdout. If --stdin was
+and the SHA-1 hash of that list is printed to stdout. If --stdin was
also used then this is prefixed by either "pack\t", or "keep\t" if a
new .keep file was successfully created. This is useful to remove a
.keep file used as a lock to prevent the race with 'git repack'
View
2  git-log.html
@@ -2149,7 +2149,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
<em>raw</em>
</p>
<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
View
4 git-ls-files.html
@@ -1098,7 +1098,7 @@ <h2 id="_output">Output</h2>
</div></div>
<div class="paragraph"><p><em>git ls-files --unmerged</em> and <em>git ls-files --stage</em> can be used to examine
detailed information on unmerged paths.</p></div>
-<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA1 pair,
+<div class="paragraph"><p>For an unmerged path, instead of recording a single mode/SHA-1 pair,
the index records up to three such pairs; one from tree O in stage
1, A in stage 2, and B in stage 3. This information can be used by
the user (or the porcelain) to see what should eventually be recorded at the
@@ -1164,7 +1164,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-ls-files.txt
@@ -164,7 +164,7 @@ which case it outputs:
'git ls-files --unmerged' and 'git ls-files --stage' can be used to examine
detailed information on unmerged paths.
-For an unmerged path, instead of recording a single mode/SHA1 pair,
+For an unmerged path, instead of recording a single mode/SHA-1 pair,
the index records up to three such pairs; one from tree O in stage
1, A in stage 2, and B in stage 3. This information can be used by
the user (or the porcelain) to see what should eventually be recorded at the
View
4 git-merge-index.html
@@ -755,7 +755,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>This looks up the &lt;file&gt;(s) in the index and, if there are any merge
-entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
+entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty
argument if no file), and &lt;file&gt; as argument 4. File modes for the three
files are passed as arguments 5, 6 and 7.</p></div>
</div>
@@ -848,7 +848,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-merge-index.txt
@@ -14,7 +14,7 @@ SYNOPSIS
DESCRIPTION
-----------
This looks up the <file>(s) in the index and, if there are any merge
-entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty
+entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty
argument if no file), and <file> as argument 4. File modes for the three
files are passed as arguments 5, 6 and 7.
View
4 git-pack-objects.html
@@ -792,7 +792,7 @@ <h2 id="_options">OPTIONS</h2>
Write into a pair of files (.pack and .idx), using
&lt;base-name&gt; to determine the name of the created file.
When this option is used, the two files are written in
- &lt;base-name&gt;-&lt;SHA1&gt;.{pack,idx} files. &lt;SHA1&gt; is a hash
+ &lt;base-name&gt;-&lt;SHA-1&gt;.{pack,idx} files. &lt;SHA-1&gt; is a hash
of the sorted object names to make the resulting filename
based on the pack content, and written to the standard
output of the command.
@@ -1108,7 +1108,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-pack-objects.txt
@@ -50,7 +50,7 @@ base-name::
Write into a pair of files (.pack and .idx), using
<base-name> to determine the name of the created file.
When this option is used, the two files are written in
- <base-name>-<SHA1>.{pack,idx} files. <SHA1> is a hash
+ <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash
of the sorted object names to make the resulting filename
based on the pack content, and written to the standard
output of the command.
View
4 git-patch-id.html
@@ -754,7 +754,7 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="paragraph"><p>A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with
+<div class="paragraph"><p>A "patch ID" is nothing but a SHA-1 of the diff associated with a patch, with
whitespace and line numbers ignored. As such, it&#8217;s "reasonably stable", but at
the same time also reasonably unique, i.e., two patches that have the same "patch
ID" are almost guaranteed to be the same thing.</p></div>
@@ -791,7 +791,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-patch-id.txt
@@ -12,7 +12,7 @@ SYNOPSIS
DESCRIPTION
-----------
-A "patch ID" is nothing but a SHA1 of the diff associated with a patch, with
+A "patch ID" is nothing but a SHA-1 of the diff associated with a patch, with
whitespace and line numbers ignored. As such, it's "reasonably stable", but at
the same time also reasonably unique, i.e., two patches that have the same "patch
ID" are almost guaranteed to be the same thing.
View
6 git-replace.html
@@ -757,8 +757,8 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>Adds a <em>replace</em> reference in <code>refs/replace/</code> namespace.</p></div>
-<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA1 of the object that is
-replaced. The content of the <em>replace</em> reference is the SHA1 of the
+<div class="paragraph"><p>The name of the <em>replace</em> reference is the SHA-1 of the object that is
+replaced. The content of the <em>replace</em> reference is the SHA-1 of the
replacement object.</p></div>
<div class="paragraph"><p>Unless <code>-f</code> is given, the <em>replace</em> reference must not yet exist.</p></div>
<div class="paragraph"><p>Replacement references will be used by default by all Git commands
@@ -847,7 +847,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-replace.txt
@@ -16,8 +16,8 @@ DESCRIPTION
-----------
Adds a 'replace' reference in `refs/replace/` namespace.
-The name of the 'replace' reference is the SHA1 of the object that is
-replaced. The content of the 'replace' reference is the SHA1 of the
+The name of the 'replace' reference is the SHA-1 of the object that is
+replaced. The content of the 'replace' reference is the SHA-1 of the
replacement object.
Unless `-f` is given, the 'replace' reference must not yet exist.
View
2  git-rev-list.html
@@ -2179,7 +2179,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
<em>raw</em>
</p>
<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
View
10 git-rev-parse.html
@@ -906,7 +906,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Usually the object names are output in SHA1 form (with
+ Usually the object names are output in SHA-1 form (with
possible <em>&#94;</em> prefix); this option makes them output in a
form as close to the original input as possible.
</p>
@@ -1070,7 +1070,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Instead of outputting the full SHA1 values of object names try to
+ Instead of outputting the full SHA-1 values of object names try to
abbreviate them to a shorter unique name. When no length is specified
7 is used. The minimum length is 4.
</p>
@@ -1125,7 +1125,7 @@ <h2 id="_options">OPTIONS</h2>
<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
<div class="sectionbody">
<div class="paragraph"><p>A revision parameter <em>&lt;rev&gt;</em> typically, but not necessarily, names a
-commit object. It uses what is called an <em>extended SHA1</em>
+commit object. It uses what is called an <em>extended SHA-1</em>
syntax. Here are various ways to spell object names. The
ones listed near the end of this list name trees and
blobs contained in a commit.</p></div>
@@ -1135,7 +1135,7 @@ <h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
</dt>
<dd>
<p>
- The full SHA1 object name (40-byte hexadecimal string), or
+ The full SHA-1 object name (40-byte hexadecimal string), or
a leading substring that is unique within the repository.
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
name the same commit object if there is no other object in
@@ -1694,7 +1694,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-04-05 15:13:57 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-rev-parse.txt
@@ -95,7 +95,7 @@ can be used.
one.
--symbolic::
- Usually the object names are output in SHA1 form (with
+ Usually the object names are output in SHA-1 form (with
possible '{caret}' prefix); this option makes them output in a
form as close to the original input as possible.
@@ -180,7 +180,7 @@ print a message to stderr and exit with nonzero status.
--short::
--short=number::
- Instead of outputting the full SHA1 values of object names try to
+ Instead of outputting the full SHA-1 values of object names try to
abbreviate them to a shorter unique name. When no length is specified
7 is used. The minimum length is 4.
View
6 git-show-branch.html
@@ -776,7 +776,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Arbitrary extended SHA1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>)
+ Arbitrary extended SHA-1 expression (see <a href="gitrevisions.html">gitrevisions(7)</a>)
that typically names a branch head or a tag.
</p>
</dd>
@@ -980,7 +980,7 @@ <h2 id="_output">OUTPUT</h2>
branch, the I-th indentation character shows a <code>+</code> sign;
otherwise it shows a space. Merge commits are denoted by
a <code>-</code> sign. Each commit shows a short name that
-can be used as an extended SHA1 to name that commit.</p></div>
+can be used as an extended SHA-1 to name that commit.</p></div>
<div class="paragraph"><p>The following example shows three branches, "master", "fixes"
and "mhf":</p></div>
<div class="listingblock">
@@ -1043,7 +1043,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-show-branch.txt
@@ -31,7 +31,7 @@ no <rev> nor <glob> is given on the command line.
OPTIONS
-------
<rev>::
- Arbitrary extended SHA1 expression (see linkgit:gitrevisions[7])
+ Arbitrary extended SHA-1 expression (see linkgit:gitrevisions[7])
that typically names a branch head or a tag.
<glob>::
@@ -142,7 +142,7 @@ displayed, indented N places. If a commit is on the I-th
branch, the I-th indentation character shows a `+` sign;
otherwise it shows a space. Merge commits are denoted by
a `-` sign. Each commit shows a short name that
-can be used as an extended SHA1 to name that commit.
+can be used as an extended SHA-1 to name that commit.
The following example shows three branches, "master", "fixes"
and "mhf":
View
4 git-show-index.html
@@ -758,7 +758,7 @@ <h2 id="_description">DESCRIPTION</h2>
<em>git pack-objects</em> command, and dumps its contents.</p></div>
<div class="paragraph"><p>The information it outputs is subset of what you can get from
<em>git verify-pack -v</em>; this command only shows the packfile
-offset and SHA1 of each object.</p></div>
+offset and SHA-1 of each object.</p></div>
</div>
</div>
<div class="sect1">
@@ -771,7 +771,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-show-index.txt
@@ -19,7 +19,7 @@ Reads given idx file for packed Git archive created with
The information it outputs is subset of what you can get from
'git verify-pack -v'; this command only shows the packfile
-offset and SHA1 of each object.
+offset and SHA-1 of each object.
GIT
---
View
6 git-show-ref.html
@@ -812,8 +812,8 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- Only show the SHA1 hash, not the reference name. When combined with
- --dereference the dereferenced tag will still be shown after the SHA1.
+ Only show the SHA-1 hash, not the reference name. When combined with
+ --dereference the dereferenced tag will still be shown after the SHA-1.
</p>
</dd>
<dt class="hdlist1">
@@ -970,7 +970,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-05-02 15:00:44 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-show-ref.txt
@@ -50,8 +50,8 @@ OPTIONS
-s::
--hash[=<n>]::
- Only show the SHA1 hash, not the reference name. When combined with
- --dereference the dereferenced tag will still be shown after the SHA1.
+ Only show the SHA-1 hash, not the reference name. When combined with
+ --dereference the dereferenced tag will still be shown after the SHA-1.
--verify::
View
2  git-show.html
@@ -1023,7 +1023,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
<em>raw</em>
</p>
<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
View
4 git-tag.html
@@ -769,7 +769,7 @@ <h2 id="_description">DESCRIPTION</h2>
in the tag message.</p></div>
<div class="paragraph"><p>If <code>-m &lt;msg&gt;</code> or <code>-F &lt;file&gt;</code> is given and <code>-a</code>, <code>-s</code>, and <code>-u &lt;key-id&gt;</code>
are absent, <code>-a</code> is implied.</p></div>
-<div class="paragraph"><p>Otherwise just a tag reference for the SHA1 object name of the commit object is
+<div class="paragraph"><p>Otherwise just a tag reference for the SHA-1 object name of the commit object is
created (i.e. a lightweight tag).</p></div>
<div class="paragraph"><p>A GnuPG signed tag object will be created when <code>-s</code> or <code>-u
&lt;key-id&gt;</code> is used. When <code>-u &lt;key-id&gt;</code> is not used, the
@@ -1190,7 +1190,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-04-03 13:30:46 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-tag.txt
@@ -33,7 +33,7 @@ in the tag message.
If `-m <msg>` or `-F <file>` is given and `-a`, `-s`, and `-u <key-id>`
are absent, `-a` is implied.
-Otherwise just a tag reference for the SHA1 object name of the commit object is
+Otherwise just a tag reference for the SHA-1 object name of the commit object is
created (i.e. a lightweight tag).
A GnuPG signed tag object will be created when `-s` or `-u
View
4 git-update-index.html
@@ -1119,7 +1119,7 @@ <h2 id="_using_index_info">Using --index-info</h2>
100755 8a1218a1024a212bb3db30becd860315f9f3ac52 2 frotz</code></pre>
</div></div>
<div class="paragraph"><p>The first line of the input feeds 0 as the mode to remove the
-path; the SHA1 does not matter as long as it is well formatted.
+path; the SHA-1 does not matter as long as it is well formatted.
Then the second and third line feeds stage 1 and stage 2 entries
for that path. After the above, we would end up with this:</p></div>
<div class="listingblock">
@@ -1300,7 +1300,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-19 16:06:22 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-update-index.txt
@@ -247,7 +247,7 @@ $ git update-index --index-info
------------
The first line of the input feeds 0 as the mode to remove the
-path; the SHA1 does not matter as long as it is well formatted.
+path; the SHA-1 does not matter as long as it is well formatted.
Then the second and third line feeds stage 1 and stage 2 entries
for that path. After the above, we would end up with this:
View
6 git-verify-pack.html
@@ -812,12 +812,12 @@ <h2 id="_output_format">OUTPUT FORMAT</h2>
<div class="paragraph"><p>When specifying the -v option the format used is:</p></div>
<div class="literalblock">
<div class="content">
-<pre><code>SHA1 type size size-in-pack-file offset-in-packfile</code></pre>
+<pre><code>SHA-1 type size size-in-pack-file offset-in-packfile</code></pre>
</div></div>
<div class="paragraph"><p>for objects that are not deltified in the pack, and</p></div>
<div class="literalblock">
<div class="content">
-<pre><code>SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1</code></pre>
+<pre><code>SHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1</code></pre>
</div></div>
<div class="paragraph"><p>for objects that are deltified.</p></div>
</div>
@@ -832,7 +832,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
4 git-verify-pack.txt
@@ -40,11 +40,11 @@ OUTPUT FORMAT
-------------
When specifying the -v option the format used is:
- SHA1 type size size-in-pack-file offset-in-packfile
+ SHA-1 type size size-in-pack-file offset-in-packfile
for objects that are not deltified in the pack, and
- SHA1 type size size-in-packfile offset-in-packfile depth base-SHA1
+ SHA-1 type size size-in-packfile offset-in-packfile depth base-SHA-1
for objects that are deltified.
View
4 git-verify-tag.html
@@ -777,7 +777,7 @@ <h2 id="_options">OPTIONS</h2>
</dt>
<dd>
<p>
- SHA1 identifiers of Git tag objects.
+ SHA-1 identifiers of Git tag objects.
</p>
</dd>
</dl></div>
@@ -793,7 +793,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  git-verify-tag.txt
@@ -21,7 +21,7 @@ OPTIONS
Print the contents of the tag object before validating it.
<tag>...::
- SHA1 identifiers of Git tag objects.
+ SHA-1 identifiers of Git tag objects.
GIT
---
View
2  git-whatchanged.html
@@ -1055,7 +1055,7 @@ <h2 id="_pretty_formats">PRETTY FORMATS</h2>
<em>raw</em>
</p>
<div class="paragraph"><p>The <em>raw</em> format shows the entire commit exactly as
-stored in the commit object. Notably, the SHA1s are
+stored in the commit object. Notably, the SHA-1s are
displayed in full, regardless of whether --abbrev or
--no-abbrev are used, and <em>parents</em> information show the
true parent commits, without taking grafts nor history
View
12 git.html
@@ -2485,7 +2485,7 @@ <h3 id="_git_diffs">Git Diffs</h3>
</dt>
<dd>
<p>
-are the 40-hexdigit SHA1 hashes,
+are the 40-hexdigit SHA-1 hashes,
</p>
</dd>
<dt class="hdlist1">
@@ -2659,7 +2659,7 @@ <h2 id="_discussion_a_id_discussion_a">Discussion<a id="Discussion"></a></h2>
"version", represents a step in the project&#8217;s history, and each parent
represents an immediately preceding step. Commits with more than one
parent represent merges of independent lines of development.</p></div>
-<div class="paragraph"><p>All objects are named by the SHA1 hash of their contents, normally
+<div class="paragraph"><p>All objects are named by the SHA-1 hash of their contents, normally
written as a string of 40 hex digits. Such names are globally unique.
The entire history leading up to a commit can be vouched for by signing
just that commit. A fourth object type, the tag, is provided for this
@@ -2667,9 +2667,9 @@ <h2 id="_discussion_a_id_discussion_a">Discussion<a id="Discussion"></a></h2>
<div class="paragraph"><p>When first created, objects are stored in individual files, but for
efficiency may later be compressed together into "pack files".</p></div>
<div class="paragraph"><p>Named pointers called refs mark interesting points in history. A ref
-may contain the SHA1 name of an object or the name of another ref. Refs
-with names beginning <code>ref/head/</code> contain the SHA1 name of the most
-recent commit (or "head") of a branch under development. SHA1 names of
+may contain the SHA-1 name of an object or the name of another ref. Refs
+with names beginning <code>ref/head/</code> contain the SHA-1 name of the most
+recent commit (or "head") of a branch under development. SHA-1 names of
tags of interest are stored under <code>ref/tags/</code>. A special ref named
<code>HEAD</code> contains the name of the currently checked-out branch.</p></div>
<div class="paragraph"><p>The index file is initialized with a list of all paths and, for each
@@ -2743,7 +2743,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-26 15:45:07 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
10 git.txt
@@ -741,7 +741,7 @@ where:
<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
contents of <old|new>,
- <old|new>-hex:: are the 40-hexdigit SHA1 hashes,
+ <old|new>-hex:: are the 40-hexdigit SHA-1 hashes,
<old|new>-mode:: are the octal representation of the file modes.
+
The file parameters can point at the user's working file
@@ -864,7 +864,7 @@ The commit, equivalent to what other systems call a "changeset" or
represents an immediately preceding step. Commits with more than one
parent represent merges of independent lines of development.
-All objects are named by the SHA1 hash of their contents, normally
+All objects are named by the SHA-1 hash of their contents, normally
written as a string of 40 hex digits. Such names are globally unique.
The entire history leading up to a commit can be vouched for by signing
just that commit. A fourth object type, the tag, is provided for this
@@ -874,9 +874,9 @@ When first created, objects are stored in individual files, but for
efficiency may later be compressed together into "pack files".
Named pointers called refs mark interesting points in history. A ref
-may contain the SHA1 name of an object or the name of another ref. Refs
-with names beginning `ref/head/` contain the SHA1 name of the most
-recent commit (or "head") of a branch under development. SHA1 names of
+may contain the SHA-1 name of an object or the name of another ref. Refs
+with names beginning `ref/head/` contain the SHA-1 name of the most
+recent commit (or "head") of a branch under development. SHA-1 names of
tags of interest are stored under `ref/tags/`. A special ref named
`HEAD` contains the name of the currently checked-out branch.
View
10 gitcore-tutorial.html
@@ -853,9 +853,9 @@ <h2 id="_creating_a_git_repository">Creating a Git repository</h2>
<td class="icon">
<div class="title">Note</div>
</td>
-<td class="content">An <em>object</em> is identified by its 160-bit SHA1 hash, aka <em>object name</em>,
+<td class="content">An <em>object</em> is identified by its 160-bit SHA-1 hash, aka <em>object name</em>,
and a reference to an object is always the 40-byte hex
-representation of that SHA1 name. The files in the <code>refs</code>
+representation of that SHA-1 name. The files in the <code>refs</code>
subdirectory are expected to contain these hex references
(usually with a final <code>\n</code> at the end), and you should thus
expect to see a number of 41-byte files containing these
@@ -1491,7 +1491,7 @@ <h2 id="_creating_a_new_branch">Creating a new branch</h2>
already discussed, the <code>HEAD</code> branch is nothing but a symlink to one of
these object pointers.</p></div>
<div class="paragraph"><p>You can at any time create a new branch by just picking an arbitrary
-point in the project history, and just writing the SHA1 name of that
+point in the project history, and just writing the SHA-1 name of that
object into a file under <code>.git/refs/heads/</code>. You can use any filename you
want (and indeed, subdirectories), but the convention is that the
"normal" branch is called <code>master</code>. That&#8217;s just a convention, though,
@@ -1973,7 +1973,7 @@ <h2 id="_how_does_the_merge_work">How does the merge work?</h2>
etc.). After reading three trees into three stages, the paths
that are the same in all three stages are <em>collapsed</em> into stage
0. Also paths that are the same in two of three stages are
-collapsed into stage 0, taking the SHA1 from either stage 2 or
+collapsed into stage 0, taking the SHA-1 from either stage 2 or
stage 3, whichever is different from stage 1 (i.e. only one side
changed from the common ancestor).</p></div>
<div class="paragraph"><p>After <em>collapsing</em> operation, paths that are different in three
@@ -2512,7 +2512,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
8 gitcore-tutorial.txt
@@ -106,9 +106,9 @@ branch. A number of the Git tools will assume that `.git/HEAD` is
valid, though.
[NOTE]
-An 'object' is identified by its 160-bit SHA1 hash, aka 'object name',
+An 'object' is identified by its 160-bit SHA-1 hash, aka 'object name',
and a reference to an object is always the 40-byte hex
-representation of that SHA1 name. The files in the `refs`
+representation of that SHA-1 name. The files in the `refs`
subdirectory are expected to contain these hex references
(usually with a final `\n` at the end), and you should thus
expect to see a number of 41-byte files containing these
@@ -763,7 +763,7 @@ already discussed, the `HEAD` branch is nothing but a symlink to one of
these object pointers.
You can at any time create a new branch by just picking an arbitrary
-point in the project history, and just writing the SHA1 name of that
+point in the project history, and just writing the SHA-1 name of that
object into a file under `.git/refs/heads/`. You can use any filename you
want (and indeed, subdirectories), but the convention is that the
"normal" branch is called `master`. That's just a convention, though,
@@ -1233,7 +1233,7 @@ file (the first tree goes to stage 1, the second to stage 2,
etc.). After reading three trees into three stages, the paths
that are the same in all three stages are 'collapsed' into stage
0. Also paths that are the same in two of three stages are
-collapsed into stage 0, taking the SHA1 from either stage 2 or
+collapsed into stage 0, taking the SHA-1 from either stage 2 or
stage 3, whichever is different from stage 1 (i.e. only one side
changed from the common ancestor).
View
4 gitdiffcore.html
@@ -873,7 +873,7 @@ <h2 id="_diffcore_break_for_splitting_up_complete_rewrites">diffcore-break: For
<div class="paragraph"><p>For the purpose of breaking a filepair, diffcore-break examines
the extent of changes between the contents of the files before
and after modification (i.e. the contents that have "bcd1234&#8230;"
-and "0123456&#8230;" as their SHA1 content ID, in the above
+and "0123456&#8230;" as their SHA-1 content ID, in the above
example). The amount of deletion of original contents and
insertion of new material are added together, and if it exceeds
the "break score", the filepair is broken into two. The break
@@ -1051,7 +1051,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  gitdiffcore.txt
@@ -108,7 +108,7 @@ it changes it to:
For the purpose of breaking a filepair, diffcore-break examines
the extent of changes between the contents of the files before
and after modification (i.e. the contents that have "bcd1234..."
-and "0123456..." as their SHA1 content ID, in the above
+and "0123456..." as their SHA-1 content ID, in the above
example). The amount of deletion of original contents and
insertion of new material are added together, and if it exceeds
the "break score", the filepair is broken into two. The break
View
83 gitglossary.html
@@ -950,14 +950,6 @@ <h2 id="_description">DESCRIPTION</h2>
(real) current branch to ask about in this state.</p></div>
</dd>
<dt class="hdlist1">
-<a id="def_dircache"></a>dircache
-</dt>
-<dd>
-<p>
- You are <strong>waaaaay</strong> behind. See <a href="#def_index">index</a>.
-</p>
-</dd>
-<dt class="hdlist1">
<a id="def_directory"></a>directory
</dt>
<dd>
@@ -976,16 +968,6 @@ <h2 id="_description">DESCRIPTION</h2>
</p>
</dd>
<dt class="hdlist1">
-<a id="def_ent"></a>ent
-</dt>
-<dd>
-<p>
- Favorite synonym to "<a href="#def_tree-ish">tree-ish</a>" by some total geeks. See
- <a href="http://en.wikipedia.org/wiki/Ent_(Middle-earth">http://en.wikipedia.org/wiki/Ent_(Middle-earth</a>) for an in-depth
- explanation. Avoid this term, not to confuse people.
-</p>
-</dd>
-<dt class="hdlist1">
<a id="def_evil_merge"></a>evil merge
</dt>
<dd>
@@ -1065,7 +1047,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- In Git&#8217;s context, synonym to <a href="#def_object_name">object name</a>.
+ In Git&#8217;s context, synonym for <a href="#def_object_name">object name</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1180,7 +1162,7 @@ <h2 id="_description">DESCRIPTION</h2>
<dd>
<p>
The unit of storage in Git. It is uniquely identified by the
- <a href="#def_SHA1">SHA1</a> of its contents. Consequently, an
+ <a href="#def_SHA1">SHA-1</a> of its contents. Consequently, an
object can not be changed.
</p>
</dd>
@@ -1207,10 +1189,9 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- The unique identifier of an <a href="#def_object">object</a>. The <a href="#def_hash">hash</a>
- of the object&#8217;s contents using the Secure Hash Algorithm
- 1 and usually represented by the 40 character hexadecimal encoding of
- the <a href="#def_hash">hash</a> of the object.
+ The unique identifier of an <a href="#def_object">object</a>. The
+ object name is usually represented by a 40 character
+ hexadecimal string. Also colloquially called <a href="#def_SHA1">SHA-1</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1229,8 +1210,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>. Also denotes an
- intelligent predator.
+ To <a href="#def_merge">merge</a> more than two <a href="#def_branch">branches</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1270,7 +1250,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- Pattern used to specify paths.
+ Pattern used to limit paths in Git commands.
</p>
<div class="paragraph"><p>Pathspecs are used on the command line of "git ls-files", "git
ls-tree", "git add", "git grep", "git diff", "git checkout",
@@ -1279,6 +1259,8 @@ <h2 id="_description">DESCRIPTION</h2>
worktree. See the documentation of each command for whether
paths are relative to the current directory or toplevel. The
pathspec syntax is as follows:</p></div>
+<div class="openblock">
+<div class="content">
<div class="ulist"><ul>
<li>
<p>
@@ -1299,11 +1281,12 @@ <h2 id="_description">DESCRIPTION</h2>
prefix will be matched against that pattern using fnmatch(3);
in particular, <em>*</em> and <em>?</em> <em>can</em> match directory separators.
</p>
+</li>
+</ul></div>
+</div></div>
<div class="paragraph"><p>For example, Documentation/*.jpg will match all .jpg files
in the Documentation subtree,
including Documentation/chapter_1/figure_1.jpg.</p></div>
-</li>
-</ul></div>
<div class="paragraph"><p>A pathspec that begins with a colon <code>:</code> has special meaning. In the
short form, the leading colon <code>:</code> is followed by zero or more "magic
signature" letters (which optionally is terminated by another colon <code>:</code>),
@@ -1316,25 +1299,10 @@ <h2 id="_description">DESCRIPTION</h2>
and a close parentheses <code>)</code>, and the remainder is the pattern to match
against the path.</p></div>
<div class="paragraph"><p>The "magic signature" consists of an ASCII symbol that is not
-alphanumeric.</p></div>
-<div class="openblock">
-<div class="content">
-<div class="dlist"><dl>
-<dt class="hdlist1">
-top <code>/</code>
-</dt>
-<dd>
-<p>
- The magic word <code>top</code> (mnemonic: <code>/</code>) makes the pattern match
- from the root of the working tree, even when you are running
- the command from inside a subdirectory.
-</p>
-</dd>
-</dl></div>
-</div></div>
-<div class="paragraph"><p>Currently only the slash <code>/</code> is recognized as the "magic signature",
-but it is envisioned that we will support more types of magic in later
-versions of Git.</p></div>
+alphanumeric. Currently only the slash <code>/</code> is recognized as a
+"magic signature": it makes the pattern match from the root of
+the working tree, even when you are running the command from
+inside a subdirectory.</p></div>
<div class="paragraph"><p>A pathspec with only a colon means "there is no pathspec". This form
should not be combined with other pathspec.</p></div>
</dd>
@@ -1435,7 +1403,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- A 40-byte hex representation of a <a href="#def_SHA1">SHA1</a> or a name that
+ A 40-byte hex representation of a <a href="#def_SHA1">SHA-1</a> or a name that
denotes a particular <a href="#def_object">object</a>. They may be stored in
a file under <code>$GIT_DIR/refs/</code> directory, or
in the <code>$GIT_DIR/packed-refs</code> file.
@@ -1459,15 +1427,7 @@ <h2 id="_description">DESCRIPTION</h2>
<p>
A "refspec" is used by <a href="#def_fetch">fetch</a> and
<a href="#def_push">push</a> to describe the mapping between remote
- <a href="#def_ref">ref</a> and local ref. They are combined with a colon in
- the format &lt;src&gt;:&lt;dst&gt;, preceded by an optional plus sign, +.
- For example: <code>git fetch $URL
- refs/heads/master:refs/heads/origin</code> means "grab the master
- <a href="#def_branch">branch</a> <a href="#def_head">head</a> from the $URL and store
- it as my origin branch head". And <code>git push
- $URL refs/heads/master:refs/heads/to-upstream</code> means "publish my
- master branch head as to-upstream branch at $URL". See also
- <a href="git-push.html">git-push(1)</a>.
+ <a href="#def_ref">ref</a> and local ref.
</p>
</dd>
<dt class="hdlist1">
@@ -1533,11 +1493,12 @@ <h2 id="_description">DESCRIPTION</h2>
</p>
</dd>
<dt class="hdlist1">
-<a id="def_SHA1"></a>SHA1
+<a id="def_SHA1"></a>SHA-1
</dt>
<dd>
<p>
- Synonym for <a href="#def_object_name">object name</a>.
+ "Secure Hash Algorithm 1"; a cryptographic hash function.
+ In the context of Git used as a synonym for <a href="#def_object_name">object name</a>.
</p>
</dd>
<dt class="hdlist1">
@@ -1560,7 +1521,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- Symbolic reference: instead of containing the <a href="#def_SHA1">SHA1</a>
+ Symbolic reference: instead of containing the <a href="#def_SHA1">SHA-1</a>
id itself, it is of the format <em>ref: refs/some/thing</em> and when
referenced, it recursively dereferences to this reference.
<em><a href="#def_HEAD">HEAD</a></em> is a prime example of a symref. Symbolic
View
12 githooks.html
@@ -829,7 +829,7 @@ <h3 id="_prepare_commit_msg">prepare-commit-msg</h3>
configuration option <code>commit.template</code> is set); <code>merge</code> (if the
commit is a merge or a <code>.git/MERGE_MSG</code> file exists); <code>squash</code>
(if a <code>.git/SQUASH_MSG</code> file exists); or <code>commit</code>, followed by
-a commit SHA1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div>
+a commit SHA-1 (if a <code>-c</code>, <code>-C</code> or <code>--amend</code> option was given).</p></div>
<div class="paragraph"><p>If the exit status is non-zero, <em>git commit</em> will abort.</p></div>
<div class="paragraph"><p>The purpose of the hook is to edit the message file in place, and
it is not suppressed by the <code>--no-verify</code> option. A non-zero exit
@@ -912,11 +912,11 @@ <h3 id="_pre_push">pre-push</h3>
<div class="content">
<pre><code>refs/heads/master 67890 refs/heads/foreign 12345</code></pre>
</div></div>
-<div class="paragraph"><p>although the full, 40-character SHA1s would be supplied. If the foreign ref
-does not yet exist the <code>&lt;remote SHA1&gt;</code> will be 40 <code>0</code>. If a ref is to be
+<div class="paragraph"><p>although the full, 40-character SHA-1s would be supplied. If the foreign ref
+does not yet exist the <code>&lt;remote SHA-1&gt;</code> will be 40 <code>0</code>. If a ref is to be
deleted, the <code>&lt;local ref&gt;</code> will be supplied as <code>(delete)</code> and the <code>&lt;local
-SHA1&gt;</code> will be 40 <code>0</code>. If the local commit was specified by something other
-than a name which could be expanded (such as <code>HEAD~</code>, or a SHA1) it will be
+SHA-1&gt;</code> will be 40 <code>0</code>. If the local commit was specified by something other
+than a name which could be expanded (such as <code>HEAD~</code>, or a SHA-1) it will be
supplied as it was originally given.</p></div>
<div class="paragraph"><p>If this hook exits with a non-zero status, <em>git push</em> will abort without
pushing anything. Information about why the push is rejected may be sent
@@ -1096,7 +1096,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-03-19 16:06:22 PDT
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
10 githooks.txt
@@ -99,7 +99,7 @@ given); `template` (if a `-t` option was given or the
configuration option `commit.template` is set); `merge` (if the
commit is a merge or a `.git/MERGE_MSG` file exists); `squash`
(if a `.git/SQUASH_MSG` file exists); or `commit`, followed by
-a commit SHA1 (if a `-c`, `-C` or `--amend` option was given).
+a commit SHA-1 (if a `-c`, `-C` or `--amend` option was given).
If the exit status is non-zero, 'git commit' will abort.
@@ -196,11 +196,11 @@ hook would receive a line like the following:
refs/heads/master 67890 refs/heads/foreign 12345
-although the full, 40-character SHA1s would be supplied. If the foreign ref
-does not yet exist the `<remote SHA1>` will be 40 `0`. If a ref is to be
+although the full, 40-character SHA-1s would be supplied. If the foreign ref
+does not yet exist the `<remote SHA-1>` will be 40 `0`. If a ref is to be
deleted, the `<local ref>` will be supplied as `(delete)` and the `<local
-SHA1>` will be 40 `0`. If the local commit was specified by something other
-than a name which could be expanded (such as `HEAD~`, or a SHA1) it will be
+SHA-1>` will be 40 `0`. If the local commit was specified by something other
+than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be
supplied as it was originally given.
If this hook exits with a non-zero status, 'git push' will abort without
View
4 gitrepository-layout.html
@@ -919,7 +919,7 @@ <h2 id="_description">DESCRIPTION</h2>
</dt>
<dd>
<p>
- records the SHA1 of the object that replaces <code>&lt;obj-sha1&gt;</code>.
+ records the SHA-1 of the object that replaces <code>&lt;obj-sha1&gt;</code>.
This is similar to info/grafts and is internally used and
maintained by <a href="git-replace.html">git-replace(1)</a>. Such refs can be exchanged
between repositories while grafts are not.
@@ -1116,7 +1116,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
2  gitrepository-layout.txt
@@ -106,7 +106,7 @@ refs/remotes/`name`::
from a remote repository.
refs/replace/`<obj-sha1>`::
- records the SHA1 of the object that replaces `<obj-sha1>`.
+ records the SHA-1 of the object that replaces `<obj-sha1>`.
This is similar to info/grafts and is internally used and
maintained by linkgit:git-replace[1]. Such refs can be exchanged
between repositories while grafts are not.
View
4 gitrevisions.html
@@ -765,7 +765,7 @@ <h2 id="_description">DESCRIPTION</h2>
<h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
<div class="sectionbody">
<div class="paragraph"><p>A revision parameter <em>&lt;rev&gt;</em> typically, but not necessarily, names a
-commit object. It uses what is called an <em>extended SHA1</em>
+commit object. It uses what is called an <em>extended SHA-1</em>
syntax. Here are various ways to spell object names. The
ones listed near the end of this list name trees and
blobs contained in a commit.</p></div>
@@ -775,7 +775,7 @@ <h2 id="_specifying_revisions">SPECIFYING REVISIONS</h2>
</dt>
<dd>
<p>
- The full SHA1 object name (40-byte hexadecimal string), or
+ The full SHA-1 object name (40-byte hexadecimal string), or
a leading substring that is unique within the repository.
E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both
name the same commit object if there is no other object in
View
18 gittutorial-2.html
@@ -785,16 +785,16 @@ <h2 id="_the_git_object_database">The Git object database</h2>
<div class="paragraph"><p>What are the 7 digits of hex that Git responded to the commit with?</p></div>
<div class="paragraph"><p>We saw in part one of the tutorial that commits have names like this.
It turns out that every object in the Git history is stored under
-a 40-digit hex name. That name is the SHA1 hash of the object&#8217;s
+a 40-digit hex name. That name is the SHA-1 hash of the object&#8217;s
contents; among other things, this ensures that Git will never store
-the same data twice (since identical data is given an identical SHA1
+the same data twice (since identical data is given an identical SHA-1
name), and that the contents of a Git object will never change (since
that would change the object&#8217;s name as well). The 7 char hex strings
here are simply the abbreviation of such 40 character long strings.
Abbreviations can be used everywhere where the 40 character strings
can be used, so long as they are unambiguous.</p></div>
<div class="paragraph"><p>It is expected that the content of the commit object you created while
-following the example above generates a different SHA1 hash than
+following the example above generates a different SHA-1 hash than
the one shown above because the commit object records the time when
it was created and the name of the person performing the commit.</p></div>
<div class="paragraph"><p>We can ask Git about this particular object with the <code>cat-file</code>
@@ -816,13 +816,13 @@ <h2 id="_the_git_object_database">The Git object database</h2>
a file. In addition, a tree can also refer to other tree objects,
thus creating a directory hierarchy. You can examine the contents of
any tree using ls-tree (remember that a long enough initial portion
-of the SHA1 will also work):</p></div>
+of the SHA-1 will also work):</p></div>
<div class="listingblock">
<div class="content">
<pre><code>$ git ls-tree 92b8b694
100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt</code></pre>
</div></div>
-<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA1 hash is a
+<div class="paragraph"><p>Thus we see that this tree has one file in it. The SHA-1 hash is a
reference to that file&#8217;s data:</p></div>
<div class="listingblock">
<div class="content">
@@ -838,7 +838,7 @@ <h2 id="_the_git_object_database">The Git object database</h2>
<div class="paragraph"><p>Note that this is the old file data; so the object that Git named in
its response to the initial tree was a tree with a snapshot of the
directory state that was recorded by the first commit.</p></div>
-<div class="paragraph"><p>All of these objects are stored under their SHA1 names inside the Git
+<div class="paragraph"><p>All of these objects are stored under their SHA-1 names inside the Git
directory:</p></div>
<div class="listingblock">
<div class="content">
@@ -871,7 +871,7 @@ <h2 id="_the_git_object_database">The Git object database</h2>
</div></div>
<div class="paragraph"><p>As you can see, this tells us which branch we&#8217;re currently on, and it
tells us this by naming a file under the .git directory, which itself
-contains a SHA1 name referring to a commit object, which we can
+contains a SHA-1 name referring to a commit object, which we can
examine with cat-file:</p></div>
<div class="listingblock">
<div class="content">
@@ -951,7 +951,7 @@ <h2 id="_the_git_object_database">The Git object database</h2>
</ul></div>
<div class="paragraph"><p>Note, by the way, that lots of commands take a tree as an argument.
But as we can see above, a tree can be referred to in many different
-ways&#8212;by the SHA1 name for that tree, by the name of a commit that
+ways&#8212;by the SHA-1 name for that tree, by the name of a commit that
refers to the tree, by the name of a branch whose head refers to that
tree, etc.--and most such commands can accept any of these names.</p></div>
<div class="paragraph"><p>In command synopses, the word "tree-ish" is sometimes used to
@@ -1167,7 +1167,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-02-05 21:07:26 PST
+Last updated 2013-04-21 19:25:38 PDT
</div>
</div>
</body>
View
16 gittutorial-2.txt
@@ -46,9 +46,9 @@ What are the 7 digits of hex that Git responded to the commit with?
We saw in part one of the tutorial that commits have names like this.
It turns out that every object in the Git history is stored under
-a 40-digit hex name. That name is the SHA1 hash of the object's
+a 40-digit hex name. That name is the SHA-1 hash of the object's
contents; among other things, this ensures that Git will never store
-the same data twice (since identical data is given an identical SHA1
+the same data twice (since identical data is given an identical SHA-1
name), and that the contents of a Git object will never change (since
that would change the object's name as well). The 7 char hex strings
here are simply the abbreviation of such 40 character long strings.
@@ -56,7 +56,7 @@ Abbreviations can be used everywhere where the 40 character strings
can be used, so long as they are unambiguous.
It is expected that the content of the commit object you created while
-following the example above generates a different SHA1 hash than
+following the example above generates a different SHA-1 hash than
the one shown above because the commit object records the time when
it was created and the name of the person performing the commit.
@@ -80,14 +80,14 @@ A tree can refer to one or more "blob" objects, each corresponding to
a file. In addition, a tree can also refer to other tree objects,
thus creating a directory hierarchy. You can examine the contents of
any tree using ls-tree (remember that a long enough initial portion
-of the SHA1 will also work):
+of the SHA-1 will also work):
------------------------------------------------
$ git ls-tree 92b8b694
100644 blob 3b18e512dba79e4c8300dd08aeb37f8e728b8dad file.txt
------------------------------------------------
-Thus we see that this tree has one file in it. The SHA1 hash is a
+Thus we see that this tree has one file in it. The SHA-1 hash is a
reference to that file's data:
------------------------------------------------
@@ -106,7 +106,7 @@ Note that this is the old file data; so the object that Git named in
its response to the initial tree was a tree with a snapshot of the
directory state that was recorded by the first commit.
-All of these objects are stored under their SHA1 names inside the Git
+All of these objects are stored under their SHA-1 names inside the Git
directory:
------------------------------------------------
@@ -142,7 +142,7 @@ ref: refs/heads/master
As you can see, this tells us which branch we're currently on, and it
tells us this by naming a file under the .git directory, which itself
-contains a SHA1 name referring to a commit object, which we can
+contains a SHA-1 name referring to a commit object, which we can
examine with cat-file:
------------------------------------------------
@@ -208,7 +208,7 @@ project's history:
Note, by the way, that lots of commands take a tree as an argument.
But as we can see above, a tree can be referred to in many different
-ways--by the SHA1 name for that tree, by the name of a commit that
+ways--by the SHA-1 name for that tree, by the name of a commit that
refers to the tree, by the name of a branch whose head refers to that
tree, etc.--and most such commands can accept any of these names.
View
64 glossary-content.txt
@@ -117,9 +117,6 @@ branch --set-upstream-to` that sets what remote tracking branch the
current branch integrates with) obviously do not work, as there is no
(real) current branch to ask about in this state.
-[[def_dircache]]dircache::
- You are *waaaaay* behind. See <<def_index,index>>.
-
[[def_directory]]directory::
The list you get with "ls" :-)
@@ -128,11 +125,6 @@ current branch integrates with) obviously do not work, as there is no
it contains modifications which have not been <<def_commit,committed>> to the current
<<def_branch,branch>>.
-[[def_ent]]ent::
- Favorite synonym to "<<def_tree-ish,tree-ish>>" by some total geeks. See
- http://en.wikipedia.org/wiki/Ent_(Middle-earth) for an in-depth
- explanation. Avoid this term, not to confuse people.
-
[[def_evil_merge]]evil merge::
An evil merge is a <<def_merge,merge>> that introduces changes that
do not appear in any <<def_parent,parent>>.
@@ -174,7 +166,7 @@ current branch integrates with) obviously do not work, as there is no
created. Configured via the `.git/info/grafts` file.
[[def_hash]]hash::
- In Git's context, synonym to <<def_object_name,object name>>.
+ In Git's context, synonym for <<def_object_name,object name>>.
[[def_head]]head::
A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a
@@ -246,7 +238,7 @@ This commit is referred to as a "merge commit", or sometimes just a
[[def_object]]object::
The unit of storage in Git. It is uniquely identified by the
- <<def_SHA1,SHA1>> of its contents. Consequently, an
+ <<def_SHA1,SHA-1>> of its contents. Consequently, an
object can not be changed.
[[def_object_database]]object database::
@@ -258,10 +250,9 @@ This commit is referred to as a "merge commit", or sometimes just a
Synonym for <<def_object_name,object name>>.
[[def_object_name]]object name::
- The unique identifier of an <<def_object,object>>. The <<def_hash,hash>>
- of the object's contents using the Secure Hash Algorithm
- 1 and usually represented by the 40 character hexadecimal encoding of
- the <<def_hash,hash>> of the object.
+ The unique identifier of an <<def_object,object>>. The
+ object name is usually represented by a 40 character
+ hexadecimal string. Also colloquially called <<def_SHA1,SHA-1>>.
[[def_object_type]]object type::
One of the identifiers "<<def_commit_object,commit>>",
@@ -270,8 +261,7 @@ This commit is referred to as a "merge commit", or sometimes just a
<<def_object,object>>.
[[def_octopus]]octopus::
- To <<def_merge,merge>> more than two <<def_branch,branches>>. Also denotes an
- intelligent predator.
+ To <<def_merge,merge>> more than two <<def_branch,branches>>.
[[def_origin]]origin::
The default upstream <<def_repository,repository>>. Most projects have
@@ -291,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a
pack.
[[def_pathspec]]pathspec::
- Pattern used to specify paths.
+ Pattern used to limit paths in Git commands.
+
Pathspecs are used on the command line of "git ls-files", "git
ls-tree", "git add", "git grep", "git diff", "git checkout",
@@ -300,6 +290,8 @@ limit the scope of operations to some subset of the tree or
worktree. See the documentation of each command for whether
paths are relative to the current directory or toplevel. The
pathspec syntax is as follows:
++
+--
* any path matches itself
* the pathspec up to the last slash represents a
@@ -309,11 +301,12 @@ pathspec syntax is as follows:
of the pathname. Paths relative to the directory
prefix will be matched against that pattern using fnmatch(3);
in particular, '*' and '?' _can_ match directory separators.
+
+--
+
For example, Documentation/*.jpg will match all .jpg files
in the Documentation subtree,
including Documentation/chapter_1/figure_1.jpg.
-
+
A pathspec that begins with a colon `:` has special meaning. In the
short form, the leading colon `:` is followed by zero or more "magic
@@ -329,18 +322,10 @@ and a close parentheses `)`, and the remainder is the pattern to match
against the path.
+
The "magic signature" consists of an ASCII symbol that is not
-alphanumeric.
-+
---
-top `/`;;
- The magic word `top` (mnemonic: `/`) makes the pattern match
- from the root of the working tree, even when you are running
- the command from inside a subdirectory.
---
-+
-Currently only the slash `/` is recognized as the "magic signature",
-but it is envisioned that we will support more types of magic in later
-versions of Git.
+alphanumeric. Currently only the slash `/` is recognized as a
+"magic signature": it makes the pattern match from the root of
+the working tree, even when you are running the command from
+inside a subdirectory.
+