summaryrefslogtreecommitdiffstats
path: root/user-manual.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-04-16 21:51:15 +0900
committerJunio C Hamano <gitster@pobox.com>2019-04-16 21:51:15 +0900
commit6b7d215a58fcad73e1d989b5767c9d3b2ba6608b (patch)
tree78de8e7c65f35106dfde60f0e6b4284f09e7f43f /user-manual.html
parente0f71462e15863fa4b188b26e30db0155d52a946 (diff)
downloadgit-htmldocs-6b7d215a58fcad73e1d989b5767c9d3b2ba6608b.tar.gz
Autogenerated HTML docs for v2.21.0-419-gffac5
Diffstat (limited to 'user-manual.html')
-rw-r--r--user-manual.html10
1 files changed, 10 insertions, 0 deletions
diff --git a/user-manual.html b/user-manual.html
index 565f6dec2..7e4249ca1 100644
--- a/user-manual.html
+++ b/user-manual.html
@@ -2272,6 +2272,16 @@ This commit is referred to as a "merge commit", or sometimes just a
origin/name-of-upstream-branch, which you can see using
<code class="literal">git branch -r</code>.
</dd><dt><span class="term">
+<a name="def_overlay"></a>overlay
+</span></dt><dd>
+ Only update and add files to the working directory, but don’t
+ delete them, similar to how <span class="emphasis"><em>cp -R</em></span> would update the contents
+ in the destination directory. This is the default mode in a
+ <a class="link" href="#def_checkout">checkout</a> when checking out files from the
+ <a class="link" href="#def_index">index</a> or a <a class="link" href="#def_tree-ish">tree-ish</a>. In
+ contrast, no-overlay mode also deletes tracked files not
+ present in the source, similar to <span class="emphasis"><em>rsync --delete</em></span>.
+</dd><dt><span class="term">
<a name="def_pack"></a>pack
</span></dt><dd>
A set of objects which have been compressed into one file (to save space