git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Stefan Beller <sbeller@google.com>,
	"David A. Wheeler" <dwheeler@dwheeler.com>,
	Jacob Keller <jacob.keller@gmail.com>, git <git@vger.kernel.org>
Subject: Re: [PATCH] doc: Modify git-add doc to say "staging area"
Date: Thu, 14 Dec 2017 20:41:44 +0100	[thread overview]
Message-ID: <87tvwtayh3.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqk1xpta93.fsf@gitster.mtv.corp.google.com>


On Thu, Dec 14 2017, Junio C. Hamano jotted:

> Stefan Beller <sbeller@google.com> writes:
>
>> Anyway I think spending list band width on good documentation is
>> not bandwidth wasted.
>
> I agree with that.  I do not consider the proposed change "good".

The case you're talking about upthread is something which we could
describe in the docs as "the starting point of the staging area is that
it's equivalent to the current commit, and is thus used as an
index/cache by various commands", if that ever comes up.

I think in the vast majority of other cases talking about it as the
staging area would be an improvement, since that's the function that has
the closest correspondence to what the UI is actually doing, that we're
using it as a cache / index is usually (always?) an implementation
detail.

Even the merge case you mentioned is something where staging area makes
more sense: "We tried to merge, but had a conflict, we've staged some of
your changes leaving the rest for you to sort out".

  parent reply	other threads:[~2017-12-14 19:41 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 [this message]
2017-12-13 17:02   ` Junio C Hamano
2017-12-13 18:46     ` David A. Wheeler

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=87tvwtayh3.fsf@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=dwheeler@dwheeler.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jacob.keller@gmail.com \
    --cc=sbeller@google.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).