Autogenerated HTML docs for v1.8.1.2-545-g2f19ad

1 files changed, 37 insertions, 37 deletions

diff --git a/gitattributes.html b/gitattributes.html
index 2b9517241..b571d9b03 100644
--- a/gitattributes.html
+++ b/gitattributes.html
@@ -811,7 +811,7 @@ overrides an earlier line.  This overriding is done per
 attribute.  The rules how the pattern matches paths are the

 same as in <code>.gitignore</code> files; see <a href="gitignore.html">gitignore(5)</a>.

 Unlike <code>.gitignore</code>, negative patterns are forbidden.</p></div>

-<div class="paragraph"><p>When deciding what attributes are assigned to a path, git

+<div class="paragraph"><p>When deciding what attributes are assigned to a path, Git

 consults <code>$GIT_DIR/info/attributes</code> file (which has the highest

 precedence), <code>.gitattributes</code> file in the same directory as the

 path in question, and its parent directories up to the toplevel of the

@@ -844,7 +844,7 @@ the name of the attribute prefixed with an exclamation point <code>!</code>.</p>
 <div class="sect1">

 <h2 id="_effects">EFFECTS</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Certain operations by git can be influenced by assigning

+<div class="paragraph"><p>Certain operations by Git can be influenced by assigning

 particular attributes to a path.  Currently, the following

 operations are attributes-aware.</p></div>

 <div class="sect2">

@@ -852,7 +852,7 @@ operations are attributes-aware.</p></div>
 <div class="paragraph"><p>These attributes affect how the contents stored in the

 repository are copied to the working tree files when commands

 such as <em>git checkout</em> and <em>git merge</em> run.  They also affect how

-git stores the contents you prepare in the working tree in the

+Git stores the contents you prepare in the working tree in the

 repository upon <em>git add</em> and <em>git commit</em>.</p></div>

 <div class="sect3">

 <h4 id="_code_text_code"><code>text</code></h4>

@@ -877,7 +877,7 @@ Unset
 </dt>

 <dd>

 <p>

-        Unsetting the <code>text</code> attribute on a path tells git not to

+        Unsetting the <code>text</code> attribute on a path tells Git not to

         attempt any end-of-line conversion upon checkin or checkout.

 </p>

 </dd>

@@ -887,7 +887,7 @@ Set to string value "auto"
 <dd>

 <p>

         When <code>text</code> is set to "auto", the path is marked for automatic

-        end-of-line normalization.  If git decides that the content is

+        end-of-line normalization.  If Git decides that the content is

         text, its line endings are normalized to LF on checkin.

 </p>

 </dd>

@@ -896,13 +896,13 @@ Unspecified
 </dt>

 <dd>

 <p>

-        If the <code>text</code> attribute is unspecified, git uses the

+        If the <code>text</code> attribute is unspecified, Git uses the

         <code>core.autocrlf</code> configuration variable to determine if the

         file should be converted.

 </p>

 </dd>

 </dl></div>

-<div class="paragraph"><p>Any other value causes git to act as if <code>text</code> has been left

+<div class="paragraph"><p>Any other value causes Git to act as if <code>text</code> has been left

 unspecified.</p></div>

 </div>

 <div class="sect3">

@@ -916,7 +916,7 @@ Set to string value "crlf"
 </dt>

 <dd>

 <p>

-        This setting forces git to normalize line endings for this

+        This setting forces Git to normalize line endings for this

         file on checkin and convert them to CRLF when the file is

         checked out.

 </p>

@@ -926,7 +926,7 @@ Set to string value "lf"
 </dt>

 <dd>

 <p>

-        This setting forces git to normalize line endings to LF on

+        This setting forces Git to normalize line endings to LF on

         checkin and prevents conversion to CRLF when the file is

         checked out.

 </p>

@@ -946,10 +946,10 @@ crlf=input      eol=lf</code></pre>
 </div>

 <div class="sect3">

 <h4 id="_end_of_line_conversion">End-of-line conversion</h4>

-<div class="paragraph"><p>While git normally leaves file contents alone, it can be configured to

+<div class="paragraph"><p>While Git normally leaves file contents alone, it can be configured to

 normalize line endings to LF in the repository and, optionally, to

 convert them to CRLF when files are checked out.</p></div>

-<div class="paragraph"><p>Here is an example that will make git normalize .txt, .vcproj and .sh

+<div class="paragraph"><p>Here is an example that will make Git normalize .txt, .vcproj and .sh

 files, ensure that .vcproj files have CRLF and .sh files have LF in

 the working directory, and prevent .jpg files from being normalized

 regardless of their content.</p></div>

@@ -962,7 +962,7 @@ regardless of their content.</p></div>
 </div></div>

 <div class="paragraph"><p>Other source code management systems normalize all text files in their

 repositories, and there are two ways to enable similar automatic

-normalization in git.</p></div>

+normalization in Git.</p></div>

 <div class="paragraph"><p>If you simply want to have CRLF line endings in your working directory

 regardless of the repository you are working with, you can set the

 config variable "core.autocrlf" without changing any attributes.</p></div>

@@ -983,9 +983,9 @@ attribute to "auto" for <em>all</em> files.</p></div>
 <div class="content">

 <pre><code>*       text=auto</code></pre>

 </div></div>

-<div class="paragraph"><p>This ensures that all files that git considers to be text will have

+<div class="paragraph"><p>This ensures that all files that Git considers to be text will have

 normalized (LF) line endings in the repository.  The <code>core.eol</code>

-configuration variable controls which line endings git will use for

+configuration variable controls which line endings Git will use for

 normalized files in your working directory; the default is to use the

 native line ending for your platform, or CRLF if <code>core.autocrlf</code> is

 set.</p></div>

@@ -1004,7 +1004,7 @@ directory:</td>
 <div class="listingblock">

 <div class="content">

 <pre><code>$ echo "* text=auto" &gt;&gt;.gitattributes

-$ rm .git/index     # Remove the index to force git to

+$ rm .git/index     # Remove the index to force Git to

 $ git reset         # re-scan the working directory

 $ git status        # Show files that will be normalized

 $ git add -u

@@ -1017,16 +1017,16 @@ unset their <code>text</code> attribute before running <em>git add -u</em>.</p><
 <div class="content">

 <pre><code>manual.pdf      -text</code></pre>

 </div></div>

-<div class="paragraph"><p>Conversely, text files that git does not detect can have normalization

+<div class="paragraph"><p>Conversely, text files that Git does not detect can have normalization

 enabled manually.</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>weirdchars.txt  text</code></pre>

 </div></div>

-<div class="paragraph"><p>If <code>core.safecrlf</code> is set to "true" or "warn", git verifies if

+<div class="paragraph"><p>If <code>core.safecrlf</code> is set to "true" or "warn", Git verifies if

 the conversion is reversible for the current setting of

-<code>core.autocrlf</code>.  For "true", git rejects irreversible

-conversions; for "warn", git only prints a warning but accepts

+<code>core.autocrlf</code>.  For "true", Git rejects irreversible

+conversions; for "warn", Git only prints a warning but accepts

 an irreversible conversion.  The safety triggers to prevent such

 a conversion done to the files in the work tree, but there are a

 few exceptions.  Even though&#8230;</p></div>

@@ -1056,7 +1056,7 @@ few exceptions.  Even though&#8230;</p></div>
 </div>

 <div class="sect3">

 <h4 id="_code_ident_code"><code>ident</code></h4>

-<div class="paragraph"><p>When the attribute <code>ident</code> is set for a path, git replaces

+<div class="paragraph"><p>When the attribute <code>ident</code> is set for a path, Git replaces

 <code>$Id$</code> in the blob object with <code>$Id:</code>, followed by the

 40-character hexadecimal blob object name, followed by a dollar

 sign <code>$</code> upon checkout.  Any byte sequence that begins with

@@ -1082,7 +1082,7 @@ is that if someone unsets the filter driver definition, or does not have
 the appropriate filter program, the project should still be usable.</p></div>

 <div class="paragraph"><p>Another use of the content filtering is to store the content that cannot

 be directly used in the repository (e.g. a UUID that refers to the true

-content stored outside git, or an encrypted content) and turn it into a

+content stored outside Git, or an encrypted content) and turn it into a

 usable form upon checkout (e.g. download the external content, or decrypt

 the encrypted content).</p></div>

 <div class="paragraph"><p>These two filters behave differently, and by default, a filter is taken as

@@ -1154,7 +1154,7 @@ repository format for that file to change, such as adding a
 clean/smudge filter or text/eol/ident attributes, merging anything

 where the attribute is not in place would normally cause merge

 conflicts.</p></div>

-<div class="paragraph"><p>To prevent these unnecessary merge conflicts, git can be told to run a

+<div class="paragraph"><p>To prevent these unnecessary merge conflicts, Git can be told to run a

 virtual check-out and check-in of all three stages of a file when

 resolving a three-way merge by setting the <code>merge.renormalize</code>

 configuration variable.  This prevents changes caused by check-in

@@ -1171,11 +1171,11 @@ resolved manually.</p></div>
 <h3 id="_generating_diff_text">Generating diff text</h3>

 <div class="sect3">

 <h4 id="_code_diff_code"><code>diff</code></h4>

-<div class="paragraph"><p>The attribute <code>diff</code> affects how <em>git</em> generates diffs for particular

-files. It can tell git whether to generate a textual patch for the path

+<div class="paragraph"><p>The attribute <code>diff</code> affects how Git generates diffs for particular

+files. It can tell Git whether to generate a textual patch for the path

 or to treat the path as a binary file.  It can also affect what line is

-shown on the hunk header <code>@@ -k,l +n,m @@</code> line, tell git to use an

-external command to generate the diff, or ask git to convert binary

+shown on the hunk header <code>@@ -k,l +n,m @@</code> line, tell Git to use an

+external command to generate the diff, or ask Git to convert binary

 files to a text format before generating the diff.</p></div>

 <div class="dlist"><dl>

 <dt class="hdlist1">

@@ -1218,7 +1218,7 @@ String
         specify one or more options, as described in the following

         section. The options for the diff driver "foo" are defined

         by the configuration variables in the "diff.foo" section of the

-        git config file.

+        Git config file.

 </p>

 </dd>

 </dl></div>

@@ -1235,7 +1235,7 @@ wrong place to talk about it.  However&#8230;</p></div>
 <pre><code>[diff "jcdiff"]

         command = j-c-diff</code></pre>

 </div></div>

-<div class="paragraph"><p>When git needs to show you a diff for the path with <code>diff</code>

+<div class="paragraph"><p>When Git needs to show you a diff for the path with <code>diff</code>

 attribute set to <code>jcdiff</code>, it calls the command you specified

 with the above configuration, i.e. <code>j-c-diff</code>, with 7

 parameters, just like <code>GIT_EXTERNAL_DIFF</code> program is called.

@@ -1414,7 +1414,7 @@ addition to</em> the usual binary diff that you might send.</td>
 </tr></table>

 </div>

 <div class="paragraph"><p>Because text conversion can be slow, especially when doing a

-large number of them with <code>git log -p</code>, git provides a mechanism

+large number of them with <code>git log -p</code>, Git provides a mechanism

 to cache the output and use it in future diffs.  To enable

 caching, set the "cachetextconv" variable in your diff driver&#8217;s

 config. For example:</p></div>

@@ -1426,7 +1426,7 @@ config. For example:</p></div>
 </div></div>

 <div class="paragraph"><p>This will cache the result of running "exif" on each blob

 indefinitely. If you change the textconv config variable for a

-diff driver, git will automatically invalidate the cache entries

+diff driver, Git will automatically invalidate the cache entries

 and re-run the textconv filter. If you want to invalidate the

 cache manually (e.g., because your version of "exif" was updated

 and now produces better output), you can remove the cache

@@ -1444,7 +1444,7 @@ not bound to find line-oriented changes, nor is it necessary for the
 output to resemble unified diff. You are free to locate and report

 changes in the most appropriate way for your data format.</p></div>

 <div class="paragraph"><p>A textconv, by comparison, is much more limiting. You provide a

-transformation of the data into a line-oriented text format, and git

+transformation of the data into a line-oriented text format, and Git

 uses its regular diff tools to generate the output. There are several

 advantages to choosing this method:</p></div>

 <div class="olist arabic"><ol class="arabic">

@@ -1459,7 +1459,7 @@ Ease of use. It is often much simpler to write a binary to text
 <li>

 <p>

 Git diff features. By performing only the transformation step

-   yourself, you can still utilize many of git&#8217;s diff features,

+   yourself, you can still utilize many of Git&#8217;s diff features,

    including colorization, word-diff, and combined diffs for merges.

 </p>

 </li>

@@ -1486,7 +1486,7 @@ attribute in the <code>.gitattributes</code> file:</p></div>
 <div class="content">

 <pre><code>*.ps -diff</code></pre>

 </div></div>

-<div class="paragraph"><p>This will cause git to generate <code>Binary files differ</code> (or a binary

+<div class="paragraph"><p>This will cause Git to generate <code>Binary files differ</code> (or a binary

 patch, if binary patches are enabled) instead of a regular diff.</p></div>

 <div class="paragraph"><p>However, one may also want to specify other diff driver attributes. For

 example, you might want to use <code>textconv</code> to convert postscript files to

@@ -1661,7 +1661,7 @@ Set
 </dt>

 <dd>

 <p>

-        Notice all types of potential whitespace errors known to git.

+        Notice all types of potential whitespace errors known to Git.

         The tab width is taken from the value of the <code>core.whitespace</code>

         configuration variable.

 </p>

@@ -1705,7 +1705,7 @@ archive files.</p></div>
 </div>

 <div class="sect3">

 <h4 id="_code_export_subst_code"><code>export-subst</code></h4>

-<div class="paragraph"><p>If the attribute <code>export-subst</code> is set for a file then git will expand

+<div class="paragraph"><p>If the attribute <code>export-subst</code> is set for a file then Git will expand

 several placeholders when adding this file to an archive.  The

 expansion depends on the availability of a commit ID, i.e., if

 <a href="git-archive.html">git-archive(1)</a> has been given a tree instead of a commit or a

@@ -1799,7 +1799,7 @@ abc     -foo -bar
 <li>

 <p>

 By examining <code>t/.gitattributes</code> (which is in the same

-   directory as the path in question), git finds that the first

+   directory as the path in question), Git finds that the first

    line matches.  <code>merge</code> attribute is set.  It also finds that

    the second line matches, and attributes <code>foo</code> and <code>bar</code>

    are unset.

@@ -1850,7 +1850,7 @@ frotz   unspecified</code></pre>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2012-11-13 14:31:09 PST

+Last updated 2013-02-05 21:07:26 PST

 </div>

 </div>

 </body>