summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Štěpán Němec <stepnem@gmail.com>2009-11-10 19:11:51 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-10 10:38:13 -0800
commit466d1f151a8a0bfde63f0fa5aba91bb8e0efe946 (patch)
treece87eaa33784491c3387be111b2056073ddc85c3
parentMerge branch 'maint' (diff)
downloadtgif-466d1f151a8a0bfde63f0fa5aba91bb8e0efe946.tar.xz
git-update-index.txt: Document the --really-refresh option.
Add the description next to --assume-unchanged because this option is only useful in a special case of using that option. Signed-off-by: Štěpán Němec <stepnem@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-update-index.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 25e0bbea86..6052484ab9 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -99,6 +99,10 @@ in the index e.g. when merging in a commit;
thus, in case the assumed-untracked file is changed upstream,
you will need to handle the situation manually.
+--really-refresh::
+ Like '--refresh', but checks stat information unconditionally,
+ without regard to the "assume unchanged" setting.
+
-g::
--again::
Runs 'git-update-index' itself on the paths whose index
@@ -308,7 +312,7 @@ Configuration
-------------
The command honors `core.filemode` configuration variable. If
-your repository is on an filesystem whose executable bits are
+your repository is on a filesystem whose executable bits are
unreliable, this should be set to 'false' (see linkgit:git-config[1]).
This causes the command to ignore differences in file modes recorded
in the index and the file mode on the filesystem if they differ only on