diff options
author | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
---|---|---|
committer | Junio C Hamano <junio@kernel.org> | 2010-01-31 23:04:31 +0000 |
commit | 167b1384c594ba1ce67e6aae4e4c3cfb304bf025 (patch) | |
tree | 31e32edd1f8c3544e90e2768653cffa0be026cf1 /git-fast-import.html | |
parent | 197c229dba62a22dd8e42d6fc026a00de2944081 (diff) | |
download | git-htmldocs-167b1384c594ba1ce67e6aae4e4c3cfb304bf025.tar.gz |
Autogenerated HTML docs for v1.7.0-rc1-7-gc0da5
Diffstat (limited to 'git-fast-import.html')
-rw-r--r-- | git-fast-import.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/git-fast-import.html b/git-fast-import.html index 9d591c944..6d6bc595a 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -518,7 +518,7 @@ history of the commit to be written). If the update is not a fast-forward update, fast-import will skip updating that ref and instead
prints a warning message. fast-import will always attempt to update all
branch refs, and does not stop on the first failure.</p></div>
-<div class="para"><p>Branch updates can be forced with --force, but its recommended that
+<div class="para"><p>Branch updates can be forced with --force, but it's recommended that
this only be used on an otherwise quiet repository. Using --force
is not necessary for an initial import into an empty repository.</p></div>
</div>
@@ -630,7 +630,7 @@ ambiguity in parsing.</p></div> is always copied into the identity string at the time it is being
created by fast-import. There is no way to specify a different time or
timezone.</p></div>
-<div class="para"><p>This particular format is supplied as its short to implement and
+<div class="para"><p>This particular format is supplied as it's short to implement and
may be useful to a process that wants to create a new commit
right now, without needing to use a working directory or
<em>git update-index</em>.</p></div>
@@ -808,7 +808,7 @@ quoting or escaping syntax is supported within <tt><committish></tt>.</p>< <li>
<p>
The name of an existing branch already in fast-import's internal branch
- table. If fast-import doesn't know the name, its treated as a SHA-1
+ table. If fast-import doesn't know the name, it's treated as a SHA-1
expression.
</p>
</li>
@@ -1162,7 +1162,7 @@ assigned mark.</p></div> </div></div>
<div class="para"><p>The mark command is optional here as some frontends have chosen
to generate the Git SHA-1 for the blob on their own, and feed that
-directly to <tt>commit</tt>. This is typically more work than its worth
+directly to <tt>commit</tt>. This is typically more work than it's worth
however, as marks are inexpensive to store and easy to use.</p></div>
<h3 id="_tt_data_tt"><tt>data</tt></h3><div style="clear:left"></div>
<div class="para"><p>Supplies raw data (for use as blob/file content, commit messages, or
@@ -1641,7 +1641,7 @@ memory footprint (less than 2.7 MiB per active branch).</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-01-21 17:44:27 UTC
+Last updated 2010-01-31 23:03:55 UTC
</div>
</div>
</body>
|