Re: Officially start moving to the term 'staging area'
- From
Felipe Contreras <felipe.contreras@gmail.com>
- Date
- Aug 29, 2013, 18:57 UTC
- Message-ID
- <521f998d25eb4_174378fe7481879@nysa.mail>
- In-Reply-To
- <vpqli3kqqkp.fsf@anie.imag.fr>
Matthieu Moy wrote:
Show 19 quoted lines
> Felipe Contreras <felipe.contreras@gmail.com> writes: > > > It has been discussed many times in the past that 'index' is not an > > appropriate description for what the high-level user does with it, and > > it has been agreed that 'staging area' is the best term. > > Thanks for working on this. No time for a really detailed review, but a > few remarks. > > > The term 'staging area' is more intuitive [...] > > > > The first step in moving Git towards this term, is first to add --stage > > options for every command that uses --index or --cache. > > These explanations make sense. I think it would be better to put part of > it in commit messages, so that future contributors can "git blame" the > doc/implem of these --stage and find them (i.e. avoid the > misunderstanding that occured with "git stage" command which was > proposed for removal).
Yes, but which commit? All of them? Perhaps it would make sense to add a link to the cover e-mail, or add an explanation in Documentation/gitstagingarea.txt or something.
Show 5 quoted lines
> > Moreover, the --stage and --work > > --work alone sounds weird. At least to me, it does not immediately imply > "working tree". It is tempting to call the option --work-tree, but git > already has a global option with that name (git --work-tree=foo bar).
Yes, --work sounds weird, but so does --cherry. I thought about --wt, but I felt --work was more understandable, and --work-tree doesn't really give much more value, except more characters to type =/
Show 7 quoted lines
> > reset', and after these options are added, the complicated table to > > explain the different behaviors between --soft, --mixed, and --hard > > becomes so simple it's not needed any more: > > I didn't understand the table, but yes, the --soft, --mixed, and --hard > is terrible, I need to read the doc whenever I do something non-trivial > with reset :-(.
Me too, I always got 'git reset --hard', now I get 'git reset', but that's about it, for the rest I have to read the documentation. Also, 'git stage reset' makes it even easier.
-- Felipe Contreras