From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: Re: First stab at glossary
Date: Thu, 18 Aug 2005 00:19:02 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.63.0508180009180.18104@wgmdd8.biozentrum.uni-wuerzburg.de> (raw)
In-Reply-To: <Pine.LNX.4.63.0508171630140.23242@iabervon.org>
Hi,
On Wed, 17 Aug 2005, Daniel Barkalow wrote:
> On Wed, 17 Aug 2005, Johannes Schindelin wrote:
>
> > On Wed, 17 Aug 2005, Daniel Barkalow wrote:
> > > [...]
> > Okay for "hash".
>
> I think we only need at most two names for this, so this is more a matter
> of fixing old usage than documenting it.
It's short enough to keep it in the glossary _and_ fix the old
documentation.
> > [blabla] index [blable] cache [bliblo]
>
> Well, it often contains information not present anywhere else (the status
> of a merge; the set of files being committed, added, or removed), so it
> isn't really a cache at all.
Okay, okay. I stand corrected.
> > Maybe I was too cautious. Linus very new idea was to think of the lowest
> > level of an SCM as a file system. But I did not want to mention that.
> > Thinking of it again, maybe I should.
>
> You probably don't need to mention that tree objects and index files can
> be thought of as filesystems, but you should specify that the working tree
> really is in the Unix filesystem, in case people have heard of the idea.
>
> It should be clear to say 'You can "cd" there and "ls" to list your
> files.', rather than 'Think "ls -laR"' which makes my think of the output,
> which is like the output from git-ls-files.
How about this:
working tree::
The set of files and directories currently being worked on,
i.e. you can work in your working tree without using git at all.
> > > > checkout::
> > >
> > > Move after "revision"?
> >
> > Ultimately, the glossary terms will be sorted alphabetically. If you look
> > at the file attached to my original mail, this is already sorted and
> > marked up using asciidoc. However, I wanted you and the list to understand
> > how I grouped terms. The asciidoc'ed file is generated by a perl script.
>
> Ah, okay.
Sorry, I attributed these "moving suggestions" to the large and angry SCM,
while those were your comments. Since Junio decided to keep the "topic
ordered" form in his repository, I moved them around according to your
mail.
> > > > resolve::
> > > > The action of fixing up manually what a failed automatic merge
> > > > left behind.
> > >
> > > "Resolve" is also used for the automatic case (e.g., in
> > > "git-resolve-script", which goes from having two commits and a message to
> > > having a new commit). I'm not sure what the distinction is supposed to be.
> >
> > I did not like that naming anyway. In reality, git-resolve-script does not
> > resolve anything, but it merges two revisions, possibly leaving something
> > to resolve.
>
> Right; I think we should change the name of the script.
How many users are there? Probably many call git-pull-script anyway,
right?
Ciao,
Dscho
next prev parent reply other threads:[~2005-08-17 22:19 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-17 14:56 First stab at glossary Johannes Schindelin
2005-08-17 19:13 ` Daniel Barkalow
2005-08-17 20:05 ` Johannes Schindelin
2005-08-17 20:57 ` Junio C Hamano
2005-08-17 21:24 ` Johannes Schindelin
2005-08-17 22:09 ` Daniel Barkalow
2005-08-17 22:19 ` Johannes Schindelin [this message]
2005-08-24 15:03 ` Tool renames? was " Tim Ottinger
2005-08-25 1:16 ` Junio C Hamano
2005-09-01 17:55 ` Tim Ottinger
2005-09-02 0:38 ` Junio C Hamano
2005-09-02 1:50 ` Horst von Brand
2005-09-06 16:42 ` Tim Ottinger
2005-09-02 18:09 ` Daniel Barkalow
2005-09-02 18:33 ` Junio C Hamano
2005-09-03 6:05 ` Junio C Hamano
2005-09-03 6:54 ` Daniel Barkalow
2005-09-03 8:29 ` Junio C Hamano
2005-09-04 17:23 ` Daniel Barkalow
2005-09-04 21:43 ` Horst von Brand
2005-09-05 0:03 ` Junio C Hamano
2005-09-05 0:26 ` Peter Williams
2005-09-05 0:35 ` Junio C Hamano
2005-09-05 0:45 ` Peter Williams
2005-09-05 0:54 ` Horst von Brand
2005-09-05 1:35 ` Junio C Hamano
2005-09-05 14:41 ` Linus Torvalds
2005-09-05 15:13 ` David Kågedal
2005-09-05 16:04 ` Linus Torvalds
2005-09-05 16:28 ` David Kågedal
2005-09-05 18:23 ` Junio C Hamano
2005-09-05 18:13 ` Junio C Hamano
2005-09-06 0:13 ` Martin Langhoff
2005-09-06 7:16 ` Linus Torvalds
2005-09-06 7:46 ` Junio C Hamano
2005-09-06 7:59 ` Linus Torvalds
2005-09-06 8:38 ` Junio C Hamano
2005-09-06 8:57 ` David Kågedal
2005-09-06 23:54 ` Junio C Hamano
2005-09-08 1:04 ` Tool renames Junio C Hamano
2005-09-15 5:56 ` H. Peter Anvin
2005-09-15 8:03 ` Junio C Hamano
2005-09-15 8:52 ` Junio C Hamano
2005-09-16 5:44 ` H. Peter Anvin
2005-09-16 6:20 ` Junio C Hamano
2005-09-06 7:53 ` Tool renames? was Re: First stab at glossary Martin Langhoff
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=Pine.LNX.4.63.0508180009180.18104@wgmdd8.biozentrum.uni-wuerzburg.de \
--to=johannes.schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.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).