diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-06 00:20:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-06 00:20:54 -0700 |
| commit | aadc81c13bbb103e7db759ba9a98a6f9509831f1 (patch) | |
| tree | dc663c8aa0a076a080a81a290f64d8c2474b6e10 /Documentation | |
| parent | Merge branch 'jc/bindiff' into next (diff) | |
| parent | update-index --again: take optional pathspecs (diff) | |
| download | tgif-aadc81c13bbb103e7db759ba9a98a6f9509831f1.tar.xz | |
Merge branch 'jc/reupdate' into next
* jc/reupdate:
update-index --again: take optional pathspecs
update-index --again
update-index: plug memory leak from prefix_path()
checkout-index: plug memory leak from prefix_path()
update-index --unresolve: work from a subdirectory.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-update-index.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 57177c7fb6..d043e86a77 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] [--unresolve] + [--really-refresh] [--unresolve] [--again] [--info-only] [--index-info] [-z] [--stdin] [--verbose] @@ -80,6 +80,10 @@ OPTIONS filesystem that has very slow lstat(2) system call (e.g. cifs). +--again:: + Runs `git-update-index` itself on the paths whose index + entries are different from those from the `HEAD` commit. + --unresolve:: Restores the 'unmerged' or 'needs updating' state of a file during a merge if it was cleared by accident. |