Commit 060729dd authored by Matthias Kestenholz's avatar Matthias Kestenholz Committed by Junio C Hamano

add documentation for update-index --unresolve

Signed-off-by: default avatarMatthias Kestenholz <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 3d990f11
......@@ -15,7 +15,7 @@ SYNOPSIS
[--cacheinfo <mode> <object> <file>]\*
[--assume-unchanged | --no-assume-unchanged]
[--really-refresh] [--unresolve]
[--info-only] [--index-info]
[-z] [--stdin]
......@@ -80,6 +80,10 @@ OPTIONS
filesystem that has very slow lstat(2) system call
(e.g. cifs).
Restores the 'unmerged' or 'needs updating' state of a
file during a merge if it was cleared by accident.
Do not create objects in the object database for all
<file> arguments that follow this flag; just insert
......@@ -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];
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment