Skip to content

Commit 7aba814

Browse files
tgummerergitster
authored andcommitted
glossary: add definition for overlay
Add a definition for what overlay means in the context of git, to clarify the recently introduced overlay-mode in git checkout. Helped-by: Elijah Newren <[email protected]> Helped-by: Junio C Hamano <[email protected]> Signed-off-by: Thomas Gummerer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent e92aa0e commit 7aba814

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Documentation/glossary-content.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,15 @@ This commit is referred to as a "merge commit", or sometimes just a
287287
origin/name-of-upstream-branch, which you can see using
288288
`git branch -r`.
289289

290+
[[def_overlay]]overlay::
291+
Only update and add files to the working directory, but don't
292+
delete them, similar to how 'cp -R' would update the contents
293+
in the destination directory. This is the default mode in a
294+
<<def_checkout,checkout>> when checking out files from the
295+
<<def_index,index>> or a <<def_tree-ish,tree-ish>>. In
296+
contrast, no-overlay mode also deletes tracked files not
297+
present in the source, similar to 'rsync --delete'.
298+
290299
[[def_pack]]pack::
291300
A set of objects which have been compressed into one file (to save space
292301
or to transmit them efficiently).

0 commit comments

Comments
 (0)