From patchwork Tue Mar 12 23:30:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gummerer X-Patchwork-Id: 10850207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C852A13B5 for ; Tue, 12 Mar 2019 23:30:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B390A29705 for ; Tue, 12 Mar 2019 23:30:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A78B229917; Tue, 12 Mar 2019 23:30:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5342929705 for ; Tue, 12 Mar 2019 23:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727032AbfCLXap (ORCPT ); Tue, 12 Mar 2019 19:30:45 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37518 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726581AbfCLXap (ORCPT ); Tue, 12 Mar 2019 19:30:45 -0400 Received: by mail-wm1-f67.google.com with SMTP id x10so36568wmg.2 for ; Tue, 12 Mar 2019 16:30:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=CANhOZReJmQksDvnG8rN8vl1dNk243PYRYh8Oa4BzAA=; b=fGyeFXRJPuPzyarCyaRCDpNb1T516s2HO4ziAqXy0aLoGAlMsuiPquyRH/9u5RJ5Ve Bw92rEz0KMwmUYFHDHIlZc1zDGSfnf3IgLg+Y9/nu8ggeDSI5sbEpVyC4bW5DMnExgXx VKwfZiZRXmGnSaWJ6EaAgndquqGsfwQ9EtW6NiYtfQbmg23hThcjcE21FtSgeT5LSV6s p86LT5eL+MuA8wZw73EQjwE0ypLe29c6qjx1uFrXsy6Glls0EbJXJPdBHLrujPx6ZUep 8Mzx8YCc8r6b7hqTrDSnD9tkILRpwtxCuk6q86qHJksk+uFXYxU7aiJWSYn9w+Vcuzz9 YDHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=CANhOZReJmQksDvnG8rN8vl1dNk243PYRYh8Oa4BzAA=; b=JNu3O62dS8Z1Oihn3rSXjcXgXPonZ1MZ936jvMDjveAW2xVB49OAQeingCAqrLJDzb okQBSqYTo/FI6RavNVBdjq4SeQ57S+b3w8lJkCrmqJd3A41RuHCAlTbfAzF1gSX2eA6z aXwMU8xu6yr/lBLgBFxQipq/K5B5vHanjjmjBYmHOIA37wiOyNOQDTDzoRM2+B7dDAXz m4lEi9uBzSP7ju+xA7nTfADdCSMbTgNDI9ay80kcyIW5+psJH3vNPvaHk9HJ/oaTZP4M Gg6qcqnnvyVQmDs0o1Mgf6RPe2/8mZXsoi39JVRw4VPCiD3zBLRLFSSPivIRSFy2eGYz N/Dg== X-Gm-Message-State: APjAAAULnPmBL8BGmdWHAB0KDzhBtEGvOgHIO+ofbEzwpzYHzo7DGgZw AV/UABG+FKGDwopeAdDiUmo71yM8 X-Google-Smtp-Source: APXvYqydxTIPKBmjqJP6V6uES9wtNCChZChNRu47rcrQBuxwF07VxvVkHbmmCKS1l935ciZR+ZIgTA== X-Received: by 2002:a1c:6c0c:: with SMTP id h12mr155995wmc.35.1552433442751; Tue, 12 Mar 2019 16:30:42 -0700 (PDT) Received: from localhost ([95.148.214.107]) by smtp.gmail.com with ESMTPSA id s5sm26947480wra.77.2019.03.12.16.30.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 16:30:41 -0700 (PDT) Date: Tue, 12 Mar 2019 23:30:40 +0000 From: Thomas Gummerer To: Duy Nguyen Cc: Philip Oakley , Junio C Hamano , Git Mailing List , Jonathan Nieder , Elijah Newren Subject: [PATCH v2] glossary: add definition for overlay Message-ID: <20190312233040.GE16414@hank.intra.tgummerer.com> References: <20190309172733.GC31533@hank.intra.tgummerer.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190309172733.GC31533@hank.intra.tgummerer.com> User-Agent: Mutt/1.11.2 (2019-01-07) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add a definition for what overlay means in the context of git, to clarify the recently introduced overlay-mode in git checkout. Helped-by: Elijah Newren Signed-off-by: Thomas Gummerer --- v2 addresses Elijah's comments (thanks!), using the wording he suggested in [*1*], which I agree is slightly better, as no-overlay mode doesn't touch untracked files. *1*: https://public-inbox.org/git/CABPp-BEv1taYym_084qVJj3-jkWWS9hKXZ=grrmH7PDUb5ASwA@mail.gmail.com/ Documentation/glossary-content.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 023ca95e7c..53df6ecb0a 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -287,6 +287,13 @@ 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 work. This is the + default mode in a <>. In contrast, + no-overlay mode will also delete 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).