@matheusbsbs / matheus-bagliano / commits / 060729dd7e
Fork 0

add documentation for update-index --unresolve

Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>

Matthias Kestenholz committed May 3, 2006 at 12:53 UTC 060729dd7e4e7d366f09d2e13d796f05ec1734a9
2 files changed +6 -2
Documentation/git-update-index.txt
+5 -1
@@ -15,7 +15,7 @@ SYNOPSIS
15 [--cacheinfo <mode> <object> <file>]\*
16 [--chmod=(+|-)x]
17 [--assume-unchanged | --no-assume-unchanged]
18 - [--really-refresh]
18 + [--really-refresh] [--unresolve]
19 [--info-only] [--index-info]
20 [-z] [--stdin]
21 [--verbose]
@@ -80,6 +80,10 @@ OPTIONS
80 filesystem that has very slow lstat(2) system call
81 (e.g. cifs).
82
83 +--unresolve::
84 + Restores the 'unmerged' or 'needs updating' state of a
85 + file during a merge if it was cleared by accident.
86 +
87 --info-only::
88 Do not create objects in the object database for all
89 <file> arguments that follow this flag; just insert
update-index.c
+1 -1
@@ -473,7 +473,7 @@ static void read_index_info(int line_termination)
473 }
474
475 static const char update_index_usage[] =
476 -"git-update-index [-q] [--add] [--replace] [--remove] [--unmerged] [--refresh] [--cacheinfo] [--chmod=(+|-)x] [--info-only] [--force-remove] [--stdin] [--index-info] [--ignore-missing] [-z] [--verbose] [--] <file>...";
476 +"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>...";
477
478 static unsigned char head_sha1[20];
479 static unsigned char merge_head_sha1[20];