diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-12-20 06:30:11 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-12-20 06:30:11 +0000 |
commit | 54bf1e2728abed073b4c0bd79830af6cdbcc67fe (patch) | |
tree | 4f813eacc91b38b7503eb07e830984d3a8b187ce /gitcore-tutorial.html | |
parent | 6a3c82713a6d40b17cafd5a3eb312fe7b25d277e (diff) | |
download | git-htmldocs-54bf1e2728abed073b4c0bd79830af6cdbcc67fe.tar.gz |
Autogenerated HTML docs for v1.6.1-rc3-51-g5832d
Diffstat (limited to 'gitcore-tutorial.html')
-rw-r--r-- | gitcore-tutorial.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 2501ba419..d92ab7094 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -1270,8 +1270,8 @@ Fast forward (no commit created; -m option ignored) hello | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre>
</div></div>
-<div class="para"><p>Because your branch did not contain anything more than what are
-already merged into the <tt>master</tt> branch, the merge operation did
+<div class="para"><p>Because your branch did not contain anything more than what had
+already been merged into the <tt>master</tt> branch, the merge operation did
not actually do a merge. Instead, it just updated the top of
the tree of your branch to that of the <tt>master</tt> branch. This is
often called <em>fast forward</em> merge.</p></div>
@@ -1640,7 +1640,7 @@ an empty directory:</p></div> <pre><tt>$ GIT_DIR=my-git.git git init</tt></pre>
</div></div>
<div class="para"><p>Make sure this directory is available for others you want your
-changes to be pulled by via the transport of your choice. Also
+changes to be pulled via the transport of your choice. Also
you need to make sure that you have the <em>git-receive-pack</em>
program on the <tt>$PATH</tt>.</p></div>
<div class="admonitionblock">
@@ -1821,7 +1821,7 @@ Push your changes to the public repository, and announce it </li>
<li>
<p>
-Every once in a while, "git-repack" the public repository.
+Every once in a while, <em>git-repack</em> the public repository.
Go back to step 5. and continue working.
</p>
</li>
@@ -2040,7 +2040,7 @@ to follow, not easier.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2008-12-19 21:37:57 UTC
+Last updated 2008-12-20 06:29:42 UTC
</div>
</div>
</body>
|