undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glossary: add definition for overlay

Browse Source 
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>
This commit is contained in:
Thomas Gummerer 2019-03-17 20:19:56 +00:00 committed by Junio C Hamano
parent e92aa0e4ef
commit 7aba814077
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/glossary-content.txt
View File

@ -287,6 +287,15 @@ This commit is referred to as a "merge commit", or sometimes just a
origin/name-of-upstream-branch, which you can see using origin/name-of-upstream-branch, which you can see using
`git branch -r`. `git branch -r`.
[[def_overlay]]overlay::
Only update and add files to the working directory, but don't
delete them, similar to how 'cp -R' would update the contents
in the destination directory. This is the default mode in a
<<def_checkout,checkout>> when checking out files from the
<<def_index,index>> or a <<def_tree-ish,tree-ish>>. In
contrast, no-overlay mode also deletes tracked files not
present in the source, similar to 'rsync --delete'.
[[def_pack]]pack:: [[def_pack]]pack::
A set of objects which have been compressed into one file (to save space A set of objects which have been compressed into one file (to save space
or to transmit them efficiently). or to transmit them efficiently).