aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorMatthias Kestenholz <matthias@spinlock.ch>2006-05-03 12:53:19 +0200
committerJunio C Hamano <junkio@cox.net>2006-05-03 14:19:01 -0700
commit060729dd7e4e7d366f09d2e13d796f05ec1734a9 (patch)
treefee2c74bf7e47c786ff717b4b1e3ff71742356ac /Documentation/git-update-index.txt
parent3d990f110c2e5b8df83f6ab3ef83497f43c7fd47 (diff)
downloadgit-060729dd7e4e7d366f09d2e13d796f05ec1734a9.tar.gz
git-060729dd7e4e7d366f09d2e13d796f05ec1734a9.tar.xz
add documentation for update-index --unresolve
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-update-index.txt')
-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 d4137fc87..4bdb2b0ff 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -15,7 +15,7 @@ SYNOPSIS
[--cacheinfo <mode> <object> <file>]\*
[--chmod=(+|-)x]
[--assume-unchanged | --no-assume-unchanged]
- [--really-refresh]
+ [--really-refresh] [--unresolve]
[--info-only] [--index-info]
[-z] [--stdin]
[--verbose]
@@ -80,6 +80,10 @@ OPTIONS
filesystem that has very slow lstat(2) system call
(e.g. cifs).
+--unresolve::
+ Restores the 'unmerged' or 'needs updating' state of a
+ file during a merge if it was cleared by accident.
+
--info-only::
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert