summaryrefslogtreecommitdiffstats
path: root/git-reset.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-08-02 07:23:38 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-08-02 07:23:38 +0000
commit092f5f02b5ca9e56e35050fd479495f5018b94b1 (patch)
tree35948c87d22eab4e01256a3598f5ad6b362e212e /git-reset.html
parent0ddc94d36eb0eafd58ec0e269e48d13d959558a7 (diff)
downloadgit-htmldocs-092f5f02b5ca9e56e35050fd479495f5018b94b1.tar.gz
Autogenerated HTML docs for v1.5.3-rc3-120-g68d422
Diffstat (limited to 'git-reset.html')
-rw-r--r--git-reset.html18
1 files changed, 9 insertions, 9 deletions
diff --git a/git-reset.html b/git-reset.html
index 6edc24205..c510bcd39 100644
--- a/git-reset.html
+++ b/git-reset.html
@@ -356,7 +356,7 @@ message, or both. Leaves working tree as it was before "reset".
</li>
<li>
<p>
-make corrections to working tree files.
+Make corrections to working tree files.
</p>
</li>
<li>
@@ -434,7 +434,7 @@ $ git pull git://info.example.com/ nitfol <b>(4)</b></tt></pre>
<ol>
<li>
<p>
-you are happily working on something, and find the changes
+You are happily working on something, and find the changes
in these files are in good order. You do not want to see them
when you run "git diff", because you plan to work on other files
and changes with these files are distracting.
@@ -442,12 +442,12 @@ and changes with these files are distracting.
</li>
<li>
<p>
-somebody asks you to pull, and the changes sounds worthy of merging.
+Somebody asks you to pull, and the changes sounds worthy of merging.
</p>
</li>
<li>
<p>
-however, you already dirtied the index (i.e. your index does
+However, you already dirtied the index (i.e. your index does
not match the HEAD commit). But you know the pull you are going
to make does not affect frotz.c nor filfre.c, so you revert the
index changes for these two files. Your changes in working tree
@@ -456,7 +456,7 @@ remain there.
</li>
<li>
<p>
-then you can pull and merge, leaving frotz.c and filfre.c
+Then you can pull and merge, leaving frotz.c and filfre.c
changes still in the working tree.
</p>
</li>
@@ -481,7 +481,7 @@ $ git reset --hard ORIG_HEAD <b>(4)</b></tt></pre>
<ol>
<li>
<p>
-try to update from the upstream resulted in a lot of
+Try to update from the upstream resulted in a lot of
conflicts; you were not ready to spend a lot of time merging
right now, so you decide to do that later.
</p>
@@ -495,13 +495,13 @@ from the index file and the working tree.
</li>
<li>
<p>
-merge a topic branch into the current branch, which resulted
+Merge a topic branch into the current branch, which resulted
in a fast forward.
</p>
</li>
<li>
<p>
-but you decided that the topic branch is not ready for public
+But you decided that the topic branch is not ready for public
consumption yet. "pull" or "merge" always leaves the original
tip of the current branch in ORIG_HEAD, so resetting hard to it
brings your index file and the working tree back to that state,
@@ -567,7 +567,7 @@ At this point the index file still has all the WIP changes you
</div>
<div id="footer">
<div id="footer-text">
-Last updated 19-Jul-2007 02:09:52 UTC
+Last updated 02-Aug-2007 07:23:09 UTC
</div>
</div>
</body>