<div class="verseblock">\r
<div class="content"><em>git-update-index</em>\r
[--add] [--remove | --force-remove] [--replace]\r
- [--refresh [-q] [--unmerged] [--ignore-missing]]\r
+ [--refresh] [-q] [--unmerged] [--ignore-missing]\r
[--cacheinfo <mode> <object> <file>]*\r
[--chmod=(+|-)x]\r
[--assume-unchanged | --no-assume-unchanged]\r
- [--really-refresh]\r
+ [--really-refresh] [--unresolve] [--again]\r
[--info-only] [--index-info]\r
[-z] [--stdin]\r
[--verbose]\r
<p>\r
If a specified file is in the index but is missing then it's\r
removed.\r
- Default behaviour is to ignore removed file.\r
+ Default behavior is to ignore removed file.\r
</p>\r
</dd>\r
<dt>\r
</p>\r
</dd>\r
<dt>\r
+--again\r
+</dt>\r
+<dd>\r
+<p>\r
+ Runs <tt>git-update-index</tt> itself on the paths whose index\r
+ entries are different from those from the <tt>HEAD</tt> commit.\r
+</p>\r
+</dd>\r
+<dt>\r
+--unresolve\r
+</dt>\r
+<dd>\r
+<p>\r
+ Restores the <em>unmerged</em> or <em>needs updating</em> state of a\r
+ file during a merge if it was cleared by accident.\r
+</p>\r
+</dd>\r
+<dt>\r
--info-only\r
</dt>\r
<dd>\r
</p>\r
</dd>\r
<dt>\r
-—\r
+--\r
</dt>\r
<dd>\r
<p>\r
<div class="content">\r
<pre><tt>$ git-checkout-index -n -f -a && git-update-index --ignore-missing --refresh</tt></pre>\r
</div></div>\r
-<p>On an inefficient filesystem with <tt>core.ignorestat</tt> set:</p>\r
+<dl>\r
+<dt>\r
+On an inefficient filesystem with <tt>core.ignorestat</tt> set\r
+</dt>\r
+<dd>\r
<div class="listingblock">\r
<div class="content">\r
-<pre><tt>$ git update-index --really-refresh <b>(1)</b>\r
-$ git update-index --no-assume-unchanged foo.c <b>(2)</b>\r
-$ git diff --name-only <b>(3)</b>\r
+<pre><tt>$ git update-index --really-refresh <b>(1)</b>\r
+$ git update-index --no-assume-unchanged foo.c <b>(2)</b>\r
+$ git diff --name-only <b>(3)</b>\r
$ edit foo.c\r
-$ git diff --name-only <b>(4)</b>\r
+$ git diff --name-only <b>(4)</b>\r
M foo.c\r
-$ git update-index foo.c <b>(5)</b>\r
-$ git diff --name-only <b>(6)</b>\r
+$ git update-index foo.c <b>(5)</b>\r
+$ git diff --name-only <b>(6)</b>\r
$ edit foo.c\r
-$ git diff --name-only <b>(7)</b>\r
-$ git update-index --no-assume-unchanged foo.c <b>(8)</b>\r
-$ git diff --name-only <b>(9)</b>\r
-M foo.c\r
-\r
-<b>(1)</b> forces lstat(2) to set "assume unchanged" bits for paths\r
- that match index.\r
-<b>(2)</b> mark the path to be edited.\r
-<b>(3)</b> this does lstat(2) and finds index matches the path.\r
-<b>(4)</b> this does lstat(2) and finds index does not match the path.\r
-<b>(5)</b> registering the new version to index sets "assume unchanged" bit.\r
-<b>(6)</b> and it is assumed unchanged.\r
-<b>(7)</b> even after you edit it.\r
-<b>(8)</b> you can tell about the change after the fact.\r
-<b>(9)</b> now it checks with lstat(2) and finds it has been changed.</tt></pre>\r
+$ git diff --name-only <b>(7)</b>\r
+$ git update-index --no-assume-unchanged foo.c <b>(8)</b>\r
+$ git diff --name-only <b>(9)</b>\r
+M foo.c</tt></pre>\r
</div></div>\r
+<ol>\r
+<li>\r
+<p>\r
+forces lstat(2) to set "assume unchanged" bits for paths that match index.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+mark the path to be edited.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+this does lstat(2) and finds index matches the path.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+this does lstat(2) and finds index does <strong>not</strong> match the path.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+registering the new version to index sets "assume unchanged" bit.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+and it is assumed unchanged.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+even after you edit it.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+you can tell about the change after the fact.\r
+</p>\r
+</li>\r
+<li>\r
+<p>\r
+now it checks with lstat(2) and finds it has been changed.\r
+</p>\r
+</li>\r
+</ol>\r
+</dd>\r
+</dl>\r
</div>\r
<h2>Configuration</h2>\r
<div class="sectionbody">\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 22-Feb-2006 10:44:48 UTC\r
+Last updated 04-Jun-2006 07:24:33 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / blobdiff