Matthias KestenholzSigned-off-by: Matthias Kestenholz <matthias@spinlock.ch>
---
I am not sure if this is already clear enough. Maybe this needs more explanation in the manpage?
---
Documentation/git-update-index.txt | 6 +++++- update-index.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
aa88546740e88b674335e26e342b53e623dcb5c6
Show changes to 2 files +6 −2
Documentation/git-update-index.txt, update-index.c
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 74844d1..a5afaaf 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_ter } 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];
-- 1.3.1.g7464