git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "David A. Wheeler" <dwheeler@dwheeler.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: "Jacob Keller" <jacob.keller@gmail.com>, "git" <git@vger.kernel.org>
Subject: Re: [PATCH] doc: Modify git-add doc to say "staging area"
Date: Wed, 13 Dec 2017 13:46:28 -0500 (EST)	[thread overview]
Message-ID: <E1ePC33-000710-2u@rmmprod07.runbox> (raw)
In-Reply-To: <xmqq8te6y30t.fsf@gitster.mtv.corp.google.com>

On Wed, 13 Dec 2017 09:02:42 -0800, Junio C Hamano <gitster@pobox.com> wrote:
> .. But that is not the only thing the index does.  When "git merge"
> finds conflicting changes, it adds the contents for common, our and
> their variants to the index for the path.  This is quite different
> from how you use the index "as staging area"; the index is being
> used as the "merging area".  When "git clean" wants to see which
> paths it finds on the filesystem are not of interest, it consults
> the index, which acts as the list of paths that are of interest.

If the phrase "staging area" is consistently used *instead* of index,
there's no problem. E.g., "git clean consults the staging area"
conveys exactly the same information as "git clean consults the index"
when index == staging area.

The term "index" has too many *other* meanings.

--- David A. Wheeler

      reply	other threads:[~2017-12-13 18:46 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-13  2:32 [PATCH] doc: Modify git-add doc to say "staging area" David A. Wheeler
2017-12-13  5:40 ` Jacob Keller
2017-12-13  5:46   ` David A. Wheeler
2017-12-13 12:54     ` Ævar Arnfjörð Bjarmason
2017-12-14 17:48       ` David A. Wheeler
2017-12-14 17:55         ` Ævar Arnfjörð Bjarmason
2017-12-14 18:08       ` Junio C Hamano
2017-12-14 18:24         ` Stefan Beller
2017-12-14 18:50           ` Junio C Hamano
2017-12-14 19:05             ` David A. Wheeler
2017-12-14 19:40               ` Junio C Hamano
     [not found]                 ` <E1ePark-0008P4-Qx@rmmprod07.runbox>
2017-12-14 21:28                   ` Stefan Beller
2017-12-14 19:41             ` Ævar Arnfjörð Bjarmason
2017-12-13 17:02   ` Junio C Hamano
2017-12-13 18:46     ` David A. Wheeler [this message]

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=E1ePC33-000710-2u@rmmprod07.runbox \
    --to=dwheeler@dwheeler.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@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).