diff options
Diffstat (limited to 'man1/git-update-index.1')
| -rw-r--r-- | man1/git-update-index.1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/man1/git-update-index.1 b/man1/git-update-index.1 index 894c40a65..8e2b3d145 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: 09/14/2022 +.\" Date: 09/15/2022 .\" Manual: Git Manual -.\" Source: Git 2.37.3.662.g36f8e7ed7d +.\" Source: Git 2.38.0.rc0 .\" Language: English .\" -.TH "GIT\-UPDATE\-INDEX" "1" "09/14/2022" "Git 2\&.37\&.3\&.662\&.g36f8e7" "Git Manual" +.TH "GIT\-UPDATE\-INDEX" "1" "09/15/2022" "Git 2\&.38\&.0\&.rc0" "Git Manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -481,7 +481,7 @@ Note that not all git commands will pay attention to this bit, and some only par .sp The update\-index flags and the read\-tree capabilities relating to the skip\-worktree bit predated the introduction of the \fBgit-sparse-checkout\fR(1) command, which provides a much easier way to configure and handle the skip\-worktree bits\&. If you want to reduce your working tree to only deal with a subset of the files in the repository, we strongly encourage the use of \fBgit-sparse-checkout\fR(1) in preference to the low\-level update\-index and read\-tree primitives\&. .sp -The primary purpose of the skip\-worktree bit is to enable sparse checkouts, i\&.e\&. to have working directories with only a subset of paths present\&. When the skip\-worktree bit is set, Git commands (such as \fBswitch\fR, \fBpull\fR, \fBmerge\fR) will avoid writing these files\&. However, these commands will sometimes write these files anyway in important cases such as conflicts during a merge or rebase\&. Git commands will also avoid treating the lack of such files as an intentional deletion; for example \fBgit add \-u\fR will not not stage a deletion for these files and \fBgit commit \-a\fR will not make a commit deleting them either\&. +The primary purpose of the skip\-worktree bit is to enable sparse checkouts, i\&.e\&. to have working directories with only a subset of paths present\&. When the skip\-worktree bit is set, Git commands (such as \fBswitch\fR, \fBpull\fR, \fBmerge\fR) will avoid writing these files\&. However, these commands will sometimes write these files anyway in important cases such as conflicts during a merge or rebase\&. Git commands will also avoid treating the lack of such files as an intentional deletion; for example \fBgit add \-u\fR will not stage a deletion for these files and \fBgit commit \-a\fR will not make a commit deleting them either\&. .sp Although this bit looks similar to assume\-unchanged bit, its goal is different\&. The assume\-unchanged bit is for leaving the file in the working tree but having Git omit checking it for changes and presuming that the file has not been changed (though if it can determine without stat\(cqing the file that it has changed, it is free to record the changes)\&. skip\-worktree tells Git to ignore the absence of the file, avoid updating it when possible with commands that normally update much of the working directory (e\&.g\&. \fBcheckout\fR, \fBswitch\fR, \fBpull\fR, etc\&.), and not have its absence be recorded in commits\&. Note that in sparse checkouts (setup by \fBgit sparse\-checkout\fR or by configuring core\&.sparseCheckout to true), if a file is marked as skip\-worktree in the index but is found in the working tree, Git will clear the skip\-worktree bit for that file\&. .SH "SPLIT INDEX" |