From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
Matthieu Moy <git@matthieu-moy.fr>,
Michael J Gruber <git@grubix.eu>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 0/7] [un]stage: officially start moving to "staging area"
Date: Tue, 10 Aug 2021 23:57:20 -0500 [thread overview]
Message-ID: <20210811045727.2381-1-felipe.contreras@gmail.com> (raw)
In the last 13 years of discussions virtually *everyone* has agreed that
the term "the index" is not a good approximation to how most users
perceive and utilize this feature. For a summary of the discssions see
my blog post [1].
This is particularly true of newcomers, which is why everyone that
teaches git uses the term "staging area".
Among all the proposals for a better name "staging area" is by far the
one with the most consensus.
Everyone except two people agreed that "the index" is not a good term.
All non-official documentation already uses the term "staging area" [2]
[3] [4], including what is considered by most people the best
documentation out there: the Pro Git book.
There is absolutely no reason not to start using the term "staging area"
officially.
Let's start by making the staging area a first-class citizen and making
'git stage' a prominent command, similar to 'git branch'. Additionally
add 'git unstage' too.
Only *one* person expressed discontent with the term "staging area".
In favor:
* Felipe Contreras
* Scott Chacon
* Jonathan Nieder
* Matthieu Moy
* Jeff King
* Miles Bader
* Ævar Arnfjörð Bjarmason
* Jay Soffian
* Pete Harlan
* Aghiles
* Piotr Krukowiecki
* Phil Hord
* Victor Engmark
* David (bouncingcats)
* Alexey Feldgendler
* Alexei Sholik
* Zbigniew Jędrzejewski-Szmek
* Sebastien Douche
* Thiago Farina
* Mark Lodato
* Philip Oakley
* William Swanson
* Ping Yin
* Hilco Wijbenga
* Lars Vogel
* David A. Wheeler
[1] https://felipec.wordpress.com/2021/08/10/git-staging-area-rename/
[2] https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository
[3] https://www.atlassian.com/git/tutorials/saving-changes
[4] https://coderefinery.github.io/git-intro/04-staging-area/
Felipe Contreras (7):
stage: add proper 'stage' command
stage: add helper to run commands
stage: add 'add' subcommand
stage: add 'remove' subcommand
unstage: add 'unstage' command
stage: add 'diff' subcommand
stage: add 'edit' command
Documentation/git-stage.txt | 38 ++++++-
Documentation/git-unstage.txt | 25 +++++
Makefile | 2 +-
builtin.h | 2 +
builtin/stage.c | 147 +++++++++++++++++++++++++
contrib/completion/git-completion.bash | 5 +
git.c | 3 +-
t/t3710-stage.sh | 51 +++++++++
8 files changed, 267 insertions(+), 6 deletions(-)
create mode 100644 Documentation/git-unstage.txt
create mode 100644 builtin/stage.c
create mode 100755 t/t3710-stage.sh
--
2.32.0.48.g096519100f
next reply other threads:[~2021-08-11 4:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 4:57 Felipe Contreras [this message]
2021-08-11 4:57 ` [PATCH 1/7] stage: add proper 'stage' command Felipe Contreras
2021-08-11 4:57 ` [PATCH 2/7] stage: add helper to run commands Felipe Contreras
2021-08-11 4:57 ` [PATCH 3/7] stage: add 'add' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 4/7] stage: add 'remove' subcommand Felipe Contreras
2021-08-11 4:57 ` [PATCH 5/7] unstage: add 'unstage' command Felipe Contreras
2021-08-11 4:57 ` [PATCH 6/7] stage: add 'diff' subcommand Felipe Contreras
2021-08-11 6:12 ` Bagas Sanjaya
2021-08-11 7:24 ` Felipe Contreras
2021-08-11 16:00 ` Junio C Hamano
2021-08-11 17:17 ` Felipe Contreras
2021-08-11 19:06 ` Jeff King
2021-08-11 20:18 ` Felipe Contreras
2021-08-11 20:30 ` Jeff King
2021-08-11 21:24 ` Felipe Contreras
2021-08-11 20:19 ` Michael J Gruber
2021-08-11 20:40 ` Jeff King
2021-08-11 20:51 ` Michael J Gruber
2021-08-11 21:02 ` Jeff King
2021-08-11 20:57 ` Junio C Hamano
2021-08-11 21:40 ` Felipe Contreras
2021-08-11 4:57 ` [PATCH 7/7] stage: add 'edit' command Felipe Contreras
2021-08-11 10:44 ` [PATCH 0/7] [un]stage: officially start moving to "staging area" Michael J Gruber
2021-08-11 16:55 ` Felipe Contreras
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=20210811045727.2381-1-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@grubix.eu \
--cc=git@matthieu-moy.fr \
--cc=git@vger.kernel.org \
--cc=jrnieder@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.
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).