diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-04 00:46:44 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-04 00:46:44 +0000 |
| commit | 46338f57d48fac86cd37a48fc6cb4b4219cea276 (patch) | |
| tree | 3c54df1ad7e23e647ba784d63dca46c8a940866c /git-update-index.txt | |
| parent | 6112cadb5b8a815a65e9924344a663ee16c6723f (diff) | |
| download | git-htmldocs-46338f57d48fac86cd37a48fc6cb4b4219cea276.tar.gz | |
Autogenerated HTML docs for v1.3.1-g935e
Diffstat (limited to 'git-update-index.txt')
| -rw-r--r-- | git-update-index.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/git-update-index.txt b/git-update-index.txt index d4137fc87..23f2b6f1a 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -10,12 +10,12 @@ SYNOPSIS -------- [verse] 'git-update-index' - [--add] [--remove | --force-remove] [--replace] - [--refresh [-q] [--unmerged] [--ignore-missing]] + [--add] [--remove | --force-remove] [--replace] + [--refresh] [-q] [--unmerged] [--ignore-missing] [--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 |