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 <newren@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Gummerer committed
Mar 17, 2019 at 20:19 UTC
7aba814077b509367281eef9db9e19b2595c1dba
1 file changed
+9
Documentation/glossary-content.txt
+9
@@ -287,6 +287,15 @@ This commit is referred to as a "merge commit", or sometimes just a
287
origin/name-of-upstream-branch, which you can see using
288
`git branch -r`.
289
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
+
299
[[def_pack]]pack::
300
A set of objects which have been compressed into one file (to save space
301
or to transmit them efficiently).