From: Junio C Hamano <gitster@pobox.com>
To: Jon Seymour <jon.seymour@gmail.com>
Cc: Miles Bader <miles@gnu.org>, Jeff King <peff@peff.net>,
Felipe Contreras <felipe.contreras@gmail.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Piotr Krukowiecki <piotr.krukowiecki.news@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: Consistent terminology: cached/staged/index
Date: Sun, 27 Feb 2011 15:57:57 -0800 [thread overview]
Message-ID: <7vmxlhm3ne.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: AANLkTinphmVJe8XW6BhjoyHgA38aopgEk=o=qEp4UT+4@mail.gmail.com
Jon Seymour <jon.seymour@gmail.com> writes:
> I guess the noun 'stage' does have a use in git-speak to refer to the
> different arms of an unresolved merge.
That is correct.
For some historical background around "cache" and "index", this
http://thread.gmane.org/gmane.comp.version-control.git/780/focus=924
may shed some light.
From: Linus Torvalds <torvalds@osdl.org>
Subject: Re: [RFC] Possible strategy cleanup for git add/remove/diff etc.
Date: Tue, 19 Apr 2005 18:51:06 -0700 (PDT)
Message-ID: <Pine.LNX.4.58.0504191846290.6467@ppc970.osdl.org>
That is indeed the whole point of the index file. In my world-view, the
index file does _everything_. It's the staging area ("work file"), it's
the merging area ("merge directory") and it's the cache file ("stat
cache").
And this one:
http://thread.gmane.org/gmane.comp.version-control.git/6670/focus=6863
is even more illuminating.
Notice that the word "staging area" is used in the old article as a way to
explain one of the three important aspects of the index, and the other
article that is about nailing down the terminology, the word does not even
come into the picture at all (one reason being that it will confuse
readers if "staging area" is used too casually in a document to precisely
define terminology, which needs to explain the merge stage(s) in the
index).
next prev parent reply other threads:[~2011-02-27 23:58 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-13 19:20 Consistent terminology: cached/staged/index Piotr Krukowiecki
2011-02-13 19:37 ` Jonathan Nieder
2011-02-13 22:58 ` Junio C Hamano
2011-02-14 2:05 ` Miles Bader
2011-02-14 5:57 ` Junio C Hamano
2011-02-14 6:27 ` Miles Bader
2011-02-14 6:59 ` Johannes Sixt
2011-02-14 7:07 ` Miles Bader
2011-02-14 10:42 ` Michael J Gruber
2011-02-14 11:04 ` Miles Bader
2011-02-14 17:12 ` Junio C Hamano
2011-02-14 22:07 ` Miles Bader
2011-02-14 22:59 ` Junio C Hamano
2011-02-14 23:47 ` Miles Bader
2011-02-15 0:12 ` Junio C Hamano
2011-02-14 13:14 ` Nguyen Thai Ngoc Duy
2011-02-14 13:43 ` Michael J Gruber
2011-02-14 13:57 ` Nguyen Thai Ngoc Duy
2011-02-14 14:17 ` Felipe Contreras
2011-02-14 14:21 ` Nguyen Thai Ngoc Duy
2011-02-14 14:40 ` Jakub Narebski
2011-02-14 15:24 ` Michael J Gruber
2011-02-14 16:00 ` Felipe Contreras
2011-02-14 16:04 ` Michael J Gruber
2011-02-14 16:27 ` Felipe Contreras
2011-02-14 3:09 ` Pete Harlan
2011-02-16 23:11 ` Drew Northup
2011-02-26 20:36 ` Felipe Contreras
2011-02-27 15:30 ` Drew Northup
2011-02-27 21:16 ` Aghiles
2011-02-28 20:53 ` Drew Northup
2011-02-14 22:32 ` Piotr Krukowiecki
2011-02-14 23:19 ` Jonathan Nieder
2011-02-15 8:29 ` Pete Harlan
2011-02-15 9:00 ` Jonathan Nieder
2011-02-15 18:15 ` Piotr Krukowiecki
2011-02-15 18:38 ` Jonathan Nieder
2011-02-26 21:09 ` Felipe Contreras
2011-02-26 21:51 ` Jonathan Nieder
2011-02-27 0:01 ` Miles Bader
2011-02-27 0:16 ` Felipe Contreras
2011-02-27 0:46 ` Jonathan Nieder
2011-02-27 8:15 ` Junio C Hamano
2011-02-27 8:43 ` Jeff King
2011-02-27 9:21 ` Miles Bader
2011-02-27 22:28 ` Jon Seymour
2011-02-27 23:57 ` Junio C Hamano [this message]
2011-02-28 9:38 ` Michael J Gruber
2011-02-27 15:34 ` Drew Northup
2011-02-28 23:03 ` Jeff King
2011-03-01 9:11 ` David
2011-03-01 9:15 ` Matthieu Moy
2011-03-01 9:32 ` Alexei Sholik
2011-03-01 17:02 ` Drew Northup
2011-03-01 17:30 ` Alexei Sholik
2011-03-01 17:41 ` Drew Northup
2011-03-01 9:27 ` Alexey Feldgendler
2011-03-01 16:46 ` Drew Northup
2011-03-04 17:18 ` Felipe Contreras
2011-03-05 4:53 ` Miles Bader
2011-03-05 5:00 ` Jonathan Nieder
2011-03-06 12:44 ` Drew Northup
[not found] ` <878466.93199.1298934204331.JavaMail.trustmail@mail1.terreactive.ch>
2011-03-01 8:43 ` Victor Engmark
2011-02-27 18:46 ` Phil Hord
2011-03-01 10:29 ` Jonathan Nieder
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vmxlhm3ne.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=jon.seymour@gmail.com \
--cc=jrnieder@gmail.com \
--cc=miles@gnu.org \
--cc=peff@peff.net \
--cc=piotr.krukowiecki.news@gmail.com \
/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.
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 NNTP newsgroup(s).