diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 21:51:15 +0900 |
commit | 6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch) | |
tree | 78de8e7c65f35106dfde60f0e6b4284f09e7f43f /glossary-content.txt | |
parent | e0f71462e15863fa4b188b26e30db0155d52a946 (diff) | |
download | git-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz |
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'glossary-content.txt')
-rw-r--r-- | glossary-content.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/glossary-content.txt b/glossary-content.txt index 023ca95e7..8d38ae601 100644 --- a/glossary-content.txt +++ b/glossary-content.txt @@ -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 `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:: A set of objects which have been compressed into one file (to save space or to transmit them efficiently). |