diff options
| author | Junio C Hamano <junio@kernel.org> | 2011-01-22 00:51:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2011-01-22 00:51:59 +0000 |
| commit | 20338b46209b971b547be9cd878c6c9fc5a77058 (patch) | |
| tree | e88b919d4420f35888463c371608a79fd1a8312e /git-reset.html | |
| parent | e089c4e564a873398d8bcf02b722228e0954c7fb (diff) | |
| download | git-htmldocs-20338b46209b971b547be9cd878c6c9fc5a77058.tar.gz | |
Autogenerated HTML docs for v1.7.4-rc2-20-g8c0db6
Diffstat (limited to 'git-reset.html')
| -rw-r--r-- | git-reset.html | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/git-reset.html b/git-reset.html index 2590950f0..fe831115a 100644 --- a/git-reset.html +++ b/git-reset.html @@ -519,15 +519,11 @@ but carries forward unmerged index entries.</p></div> </dt>
<dd>
<p>
- Resets the index, updates files in the working tree that are
- different between <commit> and HEAD, but keeps those
- which are different between HEAD and the working tree (i.e.
- which have local changes).
+ Resets index entries and updates files in the working tree that are
+ different between <commit> and HEAD.
If a file that is different between <commit> and HEAD has local changes,
reset is aborted.
</p>
-<div class="paragraph"><p>In other words, --keep does a 2-way merge between <commit> and HEAD followed by
-<em>git reset --mixed <commit></em>.</p></div>
</dd>
</dl></div>
</dd>
@@ -1012,7 +1008,7 @@ entries:</p></div> </div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-11-06 00:41:57 UTC
+Last updated 2011-01-22 00:51:44 UTC
</div>
</div>
</body>
|