diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-11-25 10:58:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-11-25 10:58:17 +0000 |
| commit | 3eacf1092cf41aabd5b4ccb418b62de682b2e715 (patch) | |
| tree | 80d453957c7ba91fe2eec68a3f5d6bfd3dba51ce /gitcore-tutorial.html | |
| parent | 5706e0b5cf3d63b8c655239151d8e2ab308ffa4a (diff) | |
| download | git-htmldocs-3eacf1092cf41aabd5b4ccb418b62de682b2e715.tar.gz | |
Autogenerated HTML docs for v1.6.6-rc0-54-gb073b
Diffstat (limited to 'gitcore-tutorial.html')
| -rw-r--r-- | gitcore-tutorial.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index c9d89a85a..17c0c6c1c 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html @@ -1483,9 +1483,9 @@ $ git reset --hard master^</tt></pre> * [master] Some fun.
! [mybranch] Some work.
--
- + [mybranch] Some work.
* [master] Some fun.
-*+ [mybranch^] Initial commit</tt></pre>
+ + [mybranch] Some work.
+*+ [master^] Initial commit</tt></pre>
</div></div>
<div class="para"><p>Now we are ready to experiment with the merge by hand.</p></div>
<div class="para"><p><tt>git merge</tt> command, when merging two branches, uses 3-way merge
@@ -2040,7 +2040,7 @@ to follow, not easier.</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-11-18 07:39:10 UTC
+Last updated 2009-11-25 10:58:00 UTC
</div>
</div>
</body>
|