diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-04 00:46:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-04 00:46:44 +0000 |
| commit | 46338f57d48fac86cd37a48fc6cb4b4219cea276 (patch) | |
| tree | 3c54df1ad7e23e647ba784d63dca46c8a940866c /git-update-index.html | |
| parent | 6112cadb5b8a815a65e9924344a663ee16c6723f (diff) | |
| download | git-htmldocs-46338f57d48fac86cd37a48fc6cb4b4219cea276.tar.gz | |
Autogenerated HTML docs for v1.3.1-g935e
Diffstat (limited to 'git-update-index.html')
| -rw-r--r-- | git-update-index.html | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/git-update-index.html b/git-update-index.html index 00a23c7e8..2aed335af 100644 --- a/git-update-index.html +++ b/git-update-index.html @@ -275,11 +275,11 @@ git-update-index(1) Manual Page <div class="verseblock">
<div class="content"><em>git-update-index</em>
[--add] [--remove | --force-remove] [--replace]
- [--refresh [-q] [--unmerged] [--ignore-missing]]
+ [--refresh] [-q] [--unmerged] [--ignore-missing]
[--cacheinfo <mode> <object> <file>]*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
- [--really-refresh]
+ [--really-refresh] [--unresolve]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
@@ -395,6 +395,15 @@ using the various options:</p> </p>
</dd>
<dt>
+--unresolve
+</dt>
+<dd>
+<p>
+ Restores the <em>unmerged</em> or <em>needs updating</em> state of a
+ file during a merge if it was cleared by accident.
+</p>
+</dd>
+<dt>
--info-only
</dt>
<dd>
@@ -696,7 +705,7 @@ need to use <tt>git-update-index --chmod=</tt>.</p> </div>
<div id="footer">
<div id="footer-text">
-Last updated 29-Apr-2006 07:01:35 UTC
+Last updated 04-May-2006 00:46:26 UTC
</div>
</div>
</body>
|