From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Apr 2019 10:28:07 +0000 (+0900)
Subject: Merge branch 'tg/glossary-overlay'
X-Git-Tag: v2.22.0-rc0~107
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b024a14876ad1e557fa3f1fdacf6b96674eb8515?ds=inline;hp=-c

Merge branch 'tg/glossary-overlay'

Doc update.

* tg/glossary-overlay:
glossary: add definition for overlay
---

b024a14876ad1e557fa3f1fdacf6b96674eb8515
diff --combined Documentation/glossary-content.txt
index 023ca95e7c,d7fb770cf5..8d38ae6010
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@@ -287,6 -287,15 +287,15 @@@ This commit is referred to as a "merge 
  	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).
@@@ -404,8 -413,6 +413,8 @@@ these forms
  - "`!ATTR`" requires that the attribute `ATTR` be
    unspecified.
  +
 +Note that when matching against a tree object, attributes are still
 +obtained from working tree, not from the given tree object.
  
  exclude;;
  	After a path matches any non-exclude pathspec, it will be run