summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Kestenholz <matthias@spinlock.ch>2006-05-03 10:53:19 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-03 21:19:01 (GMT)
commit060729dd7e4e7d366f09d2e13d796f05ec1734a9 (patch)
treefee2c74bf7e47c786ff717b4b1e3ff71742356ac
parent3d990f110c2e5b8df83f6ab3ef83497f43c7fd47 (diff)
downloadgit-060729dd7e4e7d366f09d2e13d796f05ec1734a9.zip
git-060729dd7e4e7d366f09d2e13d796f05ec1734a9.tar.gz
git-060729dd7e4e7d366f09d2e13d796f05ec1734a9.tar.bz2
add documentation for update-index --unresolve
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/git-update-index.txt6
-rw-r--r--update-index.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index d4137fc..4bdb2b0 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
diff --git a/update-index.c b/update-index.c
index facec8d..9fa3d2b 100644
--- a/update-index.c
+++ b/update-index.c
@@ -473,7 +473,7 @@ static void read_index_info(int line_termination)
}
static const char update_index_usage[] =
-"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
+"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--really-refresh] [--cacheinfo] [--chmod=(+|-)x] [--assume-unchanged] [--info-only] [--force-remove] [--stdin] [--index-info] [--unresolve] [--ignore-missing] [-z] [--verbose] [--] <file>...";
static unsigned char head_sha1[20];
static unsigned char merge_head_sha1[20];