From: Thomas Gummerer <t.gummerer@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: Duy Nguyen <pclouds@gmail.com>,
Philip Oakley <philipoakley@iee.org>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: What's cooking in git.git (Mar 2019, #01; Wed, 6)
Date: Sun, 10 Mar 2019 18:27:38 +0000 [thread overview]
Message-ID: <20190310182738.GH31533@hank.intra.tgummerer.com> (raw)
In-Reply-To: <CABPp-BHtpb_EyNTNGcP+EbRbrrMJg1C=W4JenjE1AbnE1WrbNA@mail.gmail.com>
On 03/09, Elijah Newren wrote:
> Hi,
>
> On Sat, Mar 9, 2019 at 9:29 AM Thomas Gummerer <t.gummerer@gmail.com> wrote:
> >
> > On 03/07, Duy Nguyen wrote:
> > > On Thu, Mar 7, 2019 at 7:34 PM Philip Oakley <philipoakley@iee.org> wrote:
> > > > The one point I noted is that "Overlay" is a new magic term without any
> > > > explanation within the _documentation_.
> > > >
> > > > It would appear worth it to also add something (follow up patch?) to the
> > > > e.g. git glossary to clarify how overlay differs, or is similar to, the
> > > > different merge and reset modes.
> > >
> > > I think Jonathan questions the name "overlay" too. Since this is
> > > similar to "cp -R" mode, another suggestion is --copy-mode.
> >
> > That would leave the negative form as --no-copy-mode, which almost
> > sounds like we wouldn't copy anything. I think that would be more
> > confusing that [no ]overlay mode.
> >
> > I'd be fine in general with changing the name, if there is a consensus
> > for a different and better name, but I also think overlay is
> > reasonable, so I'd rather leave pushing for a different name to
> > someone else that has strong opinions about it.
> >
> > Philip, do you think something like this would help? Not sure if it
> > should be called overlay_mode in the glossary, rather than just
> > overlay?
> >
> > --- >8 ---
> > Subject: [PATCH] glossary: add definition for overlay
> >
> > Add a definition for what overlay means in the context of git, to
> > clarify the recently introduced overlay-mode in git checkout.
> >
> > Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> > ---
> > Documentation/glossary-content.txt | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
> > index 023ca95e7c..70e6477a9f 100644
> > --- a/Documentation/glossary-content.txt
> > +++ b/Documentation/glossary-content.txt
> > @@ -287,6 +287,11 @@ 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' works. This is the
> > + default in a <<def_checkout,checkout>>.
>
> I think this is good, but maybe also add:
> In contrast, no-overlay mode will also delete files not present in
> the source, similar to 'rsync --delete'
> ?
Yeah, I think that makes sense, thanks! I'll wait a bit more to see
if there are any other comments, and then send an updated version.
> > +
> > [[def_pack]]pack::
> > A set of objects which have been compressed into one file (to save space
> > or to transmit them efficiently).
> > --
> > 2.20.1.495.gaa96b0ce6b
next prev parent reply other threads:[~2019-03-10 18:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 1:34 What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
2019-03-06 1:41 ` Denton Liu
2019-03-06 23:43 ` Junio C Hamano
2019-03-06 4:43 ` Jeff King
2019-03-06 23:45 ` Junio C Hamano
2019-03-06 9:44 ` Duy Nguyen
2019-03-06 23:46 ` Junio C Hamano
2019-03-07 12:34 ` Philip Oakley
2019-03-07 12:54 ` Duy Nguyen
2019-03-09 17:27 ` Thomas Gummerer
2019-03-09 18:04 ` Elijah Newren
2019-03-10 18:27 ` Thomas Gummerer [this message]
2019-03-12 23:30 ` [PATCH v2] glossary: add definition for overlay Thomas Gummerer
2019-03-13 1:13 ` Duy Nguyen
2019-03-15 22:31 ` Thomas Gummerer
2019-03-13 1:42 ` Junio C Hamano
2019-03-15 23:10 ` Thomas Gummerer
2019-03-17 20:19 ` [PATCH v3] " Thomas Gummerer
2019-03-21 14:48 ` Philip Oakley
2019-03-22 4:54 ` Junio C Hamano
2019-03-28 21:05 ` Thomas Gummerer
2019-03-08 0:02 ` What's cooking in git.git (Mar 2019, #01; Wed, 6) Junio C Hamano
2019-03-06 12:39 ` Johannes Schindelin
2019-03-18 7:08 ` Junio C Hamano
2019-03-06 12:47 ` Johannes Schindelin
2019-03-06 23:55 ` Junio C Hamano
2019-03-06 13:26 ` Johannes Schindelin
2019-03-06 13:41 ` ps/stash-in-c, was " Johannes Schindelin
2019-03-06 23:56 ` Junio C Hamano
2019-03-06 18:10 ` Jonathan Tan
2019-03-07 0:19 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190310182738.GH31533@hank.intra.tgummerer.com \
--to=t.gummerer@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=newren@gmail.com \
--cc=pclouds@gmail.com \
--cc=philipoakley@iee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).