From: Michael J Gruber <git@drmicha.warpmail.net>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Miles Bader <miles@gnu.org>, Johannes Sixt <j.sixt@viscovery.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Piotr Krukowiecki <piotr.krukowiecki.news@gmail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: Consistent terminology: cached/staged/index
Date: Mon, 14 Feb 2011 17:04:31 +0100 [thread overview]
Message-ID: <4D59528F.6030202@drmicha.warpmail.net> (raw)
In-Reply-To: <AANLkTi=cvObd83_5qiUxLKmVxiTMP2kgMfXaRb3uo4YY@mail.gmail.com>
Felipe Contreras venit, vidit, dixit 14.02.2011 17:00:
> On Mon, Feb 14, 2011 at 5:24 PM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Felipe Contreras venit, vidit, dixit 14.02.2011 15:17:
>>> On Mon, Feb 14, 2011 at 3:43 PM, Michael J Gruber
>>> <git@drmicha.warpmail.net> wrote:
>>>> Nguyen Thai Ngoc Duy venit, vidit, dixit 14.02.2011 14:14:
>>>>> On Mon, Feb 14, 2011 at 5:42 PM, Michael J Gruber
>>>>> <git@drmicha.warpmail.net> wrote:
>>>>>> Full disclaimer: I have an alias "staged" for "diff --cached" myself...
>>>>>
>>>>> Be careful with your fingers. There's a command named "git stage".
>>>>
>>>> I know. Can we remove it as part of 1.8.0? It's our only builtin alias.
>>>
>>> I have proposed before to extend 'git stage', so you can do 'git stage
>>> diff', or if you alias 'git stage' to 'git s', just 'git s diff'. This
>>> would not conflict with the old behavior of 'git stage $file'.
>
> [...]
>
>> In principle I like this a lot: a set of commands operating on/with the
>> stage/index/cache consistently. It think it's similar in (good) spirit
>> to our earlier attempts at INDEX and WORKTREE pseudo-revs, trying to
>> give that somewhat nebulous (for noobs) index a more concrete
>> "appearance", not hidden away in options (--index, --cached) and
>> defaults (diff against index by default).
>>
>> In our case, however, I think the design principle deviates from our
>> common form:
>>
>> git foo bar
>>
>> usually means "do foo" to "bar", as most of our common commands are
>> verbs (being applied to the object "bar"). When it comes to subcommands
>> we do have inconsistencies already (double-dashed vs. undashed, e.g.),
>> but I'd prefer fewer ;)
>
> Except 'git branch', 'git tag', 'git remote', 'git stash', and 'git
> submodule'. In fact, every logical object in git seems to have their
> own command, except the stage.
>
Yes, remote, stash and submodule are the ones with the different
subcommand handling I mentioned: the subcommand is the verb, and
specified undashed.
We have other commands with double-dashed (i.e. option) subcommands,
such as "brach --set-upstream", and others single-dashed, such as "tag -v".
Note that branch, tag and stash are verbs as well as nouns.
I just think that "git verb object" is the more prevalent order, so that
we should move in that direction if we want make things better. Other
than that I would have no objection against "git object verb".
Michael
next prev parent reply other threads:[~2011-02-14 16:07 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 [this message]
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
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=4D59528F.6030202@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@gmail.com \
--cc=miles@gnu.org \
--cc=pclouds@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.