提交 b024a148 编写于 作者: J Junio C Hamano

Merge branch 'tg/glossary-overlay'

Doc update.

* tg/glossary-overlay:
  glossary: add definition for overlay
......@@ -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).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册