diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:07 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:07 +0900 |
| commit | b024a14876ad1e557fa3f1fdacf6b96674eb8515 (patch) | |
| tree | bc4e959a0308fcfdbadb03e9546ce01af4437880 | |
| parent | Merge branch 'nd/checkout-f-while-conflicted-fix' (diff) | |
| parent | glossary: add definition for overlay (diff) | |
| download | tgif-b024a14876ad1e557fa3f1fdacf6b96674eb8515.tar.xz | |
Merge branch 'tg/glossary-overlay'
Doc update.
* tg/glossary-overlay:
glossary: add definition for overlay
| -rw-r--r-- | Documentation/glossary-content.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 023ca95e7c..8d38ae6010 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/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). |