diff options
Diffstat (limited to 'man1/git-update-index.1')
| -rw-r--r-- | man1/git-update-index.1 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 33c009e9f..13d91f8dd 100644 --- a/man1/git-update-index.1 +++ b/man1/git-update-index.1 @@ -2,12 +2,12 @@ .\" Title: git-update-index .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author] .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/> -.\" Date: 2023-10-20 +.\" Date: 2023-10-23 .\" Manual: Git Manual -.\" Source: Git 2.42.0.424.gceadf0f3cf +.\" Source: Git 2.42.0.482.g2e8e77cbac .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "2023\-10\-20" "Git 2\&.42\&.0\&.424\&.gceadf0" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "2023\-10\-23" "Git 2\&.42\&.0\&.482\&.g2e8e77" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -68,7 +68,7 @@ If a specified file isn\(cqt in the index already then it\(cqs added\&. Default .PP \-\-remove .RS 4 -If a specified file is in the index but is missing then it\(cqs removed\&. Default behavior is to ignore removed file\&. +If a specified file is in the index but is missing then it\(cqs removed\&. Default behavior is to ignore removed files\&. .RE .PP \-\-refresh @@ -117,7 +117,7 @@ Set the execute permissions on the updated files\&. .PP \-\-[no\-]assume\-unchanged .RS 4 -When this flag is specified, the object names recorded for the paths are not updated\&. Instead, this option sets/unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index\&. If you want to change the working tree file, you need to unset the bit to tell Git\&. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e\&.g\&. cifs)\&. +When this flag is specified, the object names recorded for the paths are not updated\&. Instead, this option sets/unsets the "assume unchanged" bit for the paths\&. When the "assume unchanged" bit is on, the user promises not to change the file and allows Git to assume that the working tree file matches what is recorded in the index\&. If you want to change the working tree file, you need to unset the bit to tell Git\&. This is sometimes helpful when working with a big project on a filesystem that has a very slow lstat(2) system call (e\&.g\&. cifs)\&. .sp Git will fail (gracefully) in case it needs to modify this file in the index e\&.g\&. when merging in a commit; thus, in case the assumed\-untracked file is changed upstream, you will need to handle the situation manually\&. .RE @@ -130,7 +130,7 @@ Like .PP \-\-[no\-]skip\-worktree .RS 4 -When one of these flags is specified, the object name recorded for the paths are not updated\&. Instead, these options set and unset the "skip\-worktree" bit for the paths\&. See section "Skip\-worktree bit" below for more information\&. +When one of these flags is specified, the object names recorded for the paths are not updated\&. Instead, these options set and unset the "skip\-worktree" bit for the paths\&. See section "Skip\-worktree bit" below for more information\&. .RE .PP \-\-[no\-]ignore\-skip\-worktree\-entries @@ -142,14 +142,14 @@ option was specified\&. .PP \-\-[no\-]fsmonitor\-valid .RS 4 -When one of these flags is specified, the object name recorded for the paths are not updated\&. Instead, these options set and unset the "fsmonitor valid" bit for the paths\&. See section "File System Monitor" below for more information\&. +When one of these flags is specified, the object names recorded for the paths are not updated\&. Instead, these options set and unset the "fsmonitor valid" bit for the paths\&. See section "File System Monitor" below for more information\&. .RE .PP \-g, \-\-again .RS 4 Runs \fIgit update\-index\fR -itself on the paths whose index entries are different from those from the +itself on the paths whose index entries are different from those of the \fBHEAD\fR commit\&. .RE @@ -189,17 +189,17 @@ cannot be added\&. With \-\-replace flag, existing entries that conflict with th .PP \-\-stdin .RS 4 -Instead of taking list of paths from the command line, read list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. +Instead of taking a list of paths from the command line, read a list of paths from the standard input\&. Paths are separated by LF (i\&.e\&. one path per line) by default\&. .RE .PP \-\-verbose .RS 4 -Report what is being added and removed from index\&. +Report what is being added and removed from the index\&. .RE .PP \-\-index\-version <n> .RS 4 -Write the resulting index out in the named on\-disk format version\&. Supported versions are 2, 3 and 4\&. The current default version is 2 or 3, depending on whether extra features are used, such as +Write the resulting index out in the named on\-disk format version\&. Supported versions are 2, 3, and 4\&. The current default version is 2 or 3, depending on whether extra features are used, such as \fBgit add \-N\fR\&. With \fB\-\-verbose\fR, also report the version the index file uses before and after this command\&. .sp |