X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-update-index.txt;h=d043e86a776897d4ec5b6515e3cf70d89fa8a97c;hb=9bf8a517748c403098293d97318ad22a74669317;hp=57177c7fb6fea75a39c3243495b0724a207add17;hpb=1bb569ec8189e0498dc17c57e9237ffd85beb273;p=git.git diff --git a/git-update-index.txt b/git-update-index.txt index 57177c7f..d043e86a 100644 --- a/git-update-index.txt +++ b/git-update-index.txt @@ -15,7 +15,7 @@ SYNOPSIS [--cacheinfo ]\* [--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.