diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-09 16:40:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 16:40:53 -0700 |
| commit | 143f4d94c6e2188a6bedfdfa268e66b579e3fbf9 (patch) | |
| tree | cd7e9fdc32c1de58ff01281ac4bcaeb14a33b1c3 /Documentation | |
| parent | 4edd44725c621b3a2c6c9c4d8f130ceea2ba355a (diff) | |
| parent | 0cc9e70c4c9adb3e79b4a492f2f989c611d85966 (diff) | |
| download | git-143f4d94c6e2188a6bedfdfa268e66b579e3fbf9.tar.gz git-143f4d94c6e2188a6bedfdfa268e66b579e3fbf9.tar.xz | |
Merge branch 'jc/again'
* jc/again:
Fix users of prefix_path() to free() only when necessary
update-index --again: take optional pathspecs
update-index --again
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 57177c7fb..d043e86a7 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. |