summaryrefslogtreecommitdiffstats
path: root/git-format-patch.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
committerJunio C Hamano <gitster@pobox.com>2013-02-05 21:13:21 -0800
commit076ffcc834f02a4f11d7f4fe8825be3b065020ff (patch)
tree6f5fa28df80c60c9b0a1dfab028d3db33ae22fa0 /git-format-patch.html
parent3f2ed6f9b744f05cf2ad32b0c0c80aa149d9fdcb (diff)
downloadgit-htmldocs-076ffcc834f02a4f11d7f4fe8825be3b065020ff.tar.gz
Autogenerated HTML docs for v1.8.1.2-545-g2f19ad
Diffstat (limited to 'git-format-patch.html')
-rw-r--r--git-format-patch.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-format-patch.html b/git-format-patch.html
index 439c7055b..e6a3a2dd0 100644
--- a/git-format-patch.html
+++ b/git-format-patch.html
@@ -1056,7 +1056,7 @@ few lines that happen to match textually as the context, but as a
single deletion of everything old followed by a single insertion of
everything new, and the number <code>m</code> controls this aspect of the -B
option (defaults to 60%). <code>-B/70%</code> specifies that less than 30% of the
-original should remain in the result for git to consider it a total
+original should remain in the result for Git to consider it a total
rewrite (i.e. otherwise the resulting patch will be a series of
deletion and insertion mixed together with context lines).</p></div>
<div class="paragraph"><p>When used with -M, a totally-rewritten file is also considered as the
@@ -1078,7 +1078,7 @@ another file.</p></div>
Detect renames.
If <code>n</code> is specified, it is a threshold on the similarity
index (i.e. amount of addition/deletions compared to the
- file&#8217;s size). For example, <code>-M90%</code> means git should consider a
+ file&#8217;s size). For example, <code>-M90%</code> means Git should consider a
delete/add pair to be a rename if more than 90% of the file
hasn&#8217;t changed. Without a <code>%</code> sign, the number is to be read as
a fraction, with a decimal point before it. I.e., <code>-M5</code> becomes
@@ -1552,7 +1552,7 @@ will want to ensure that threading is disabled for <code>git send-email</code>.<
the commit that does not belong to the commit log message proper,
and include it with the patch submission. While one can simply write
these explanations after <code>format-patch</code> has run but before sending,
-keeping them as git notes allows them to be maintained between versions
+keeping them as Git notes allows them to be maintained between versions
of the patch series (but see the discussion of the <code>notes.rewrite</code>
configuration options in <a href="git-notes.html">git-notes(1)</a> to use this workflow).</p></div>
</dd>
@@ -1563,7 +1563,7 @@ configuration options in <a href="git-notes.html">git-notes(1)</a> to use this w
<p>
Add a signature to each message produced. Per RFC 3676 the signature
is separated from the body by a line with '-- ' on it. If the
- signature option is omitted the signature defaults to the git version
+ signature option is omitted the signature defaults to the Git version
number.
</p>
</dd>
@@ -1787,7 +1787,7 @@ section of <a href="git-imap-send.html">git-imap-send(1)</a>.</p></div>
<h3 id="_thunderbird">Thunderbird</h3>
<div class="paragraph"><p>By default, Thunderbird will both wrap emails as well as flag
them as being <em>format=flowed</em>, both of which will make the
-resulting email unusable by git.</p></div>
+resulting email unusable by Git.</p></div>
<div class="paragraph"><p>There are three different approaches: use an add-on to turn off line wraps,
configure Thunderbird to not mangle patches, or use
an external editor to keep Thunderbird from mangling the patches.</p></div>
@@ -1972,8 +1972,8 @@ The same as the previous one:
<div class="paragraph"><p>Additionally, it detects and handles renames and complete rewrites
intelligently to produce a renaming patch. A renaming patch reduces
the amount of text output, and generally makes it easier to review.
-Note that non-git "patch" programs won&#8217;t understand renaming patches, so
-use it only when you know the recipient uses git to apply your patch.</p></div>
+Note that non-Git "patch" programs won&#8217;t understand renaming patches, so
+use it only when you know the recipient uses Git to apply your patch.</p></div>
</li>
<li>
<p>
@@ -2004,7 +2004,7 @@ as e-mailable patches:
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-01-12 00:25:04 PST
+Last updated 2013-02-05 21:07:26 PST
</div>
</div>
</body>