X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-update-index.txt;h=d043e86a776897d4ec5b6515e3cf70d89fa8a97c;hb=7d65848afd42f075f6db0d03da2c9f5a9bac6267;hp=57177c7fb6fea75a39c3243495b0724a207add17;hpb=45f75a0167b4a4693f2c6005bf7db231ca91ecc8;p=git.git diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 57177c7f..d043e86a 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/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.