diff options
| author | Matthias Kestenholz <matthias@spinlock.ch> | 2006-05-03 12:53:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-03 14:19:01 -0700 |
| commit | 060729dd7e4e7d366f09d2e13d796f05ec1734a9 (patch) | |
| tree | fee2c74bf7e47c786ff717b4b1e3ff71742356ac | |
| parent | 3d990f110c2e5b8df83f6ab3ef83497f43c7fd47 (diff) | |
| download | git-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>
| -rw-r--r-- | Documentation/git-update-index.txt | 6 | ||||
| -rw-r--r-- | update-index.c | 2 |
2 files changed, 6 insertions, 2 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 diff --git a/update-index.c b/update-index.c index facec8d91..9fa3d2bb9 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]; |