From: Jakub Narebski <jnareb@gmail.com>
Date: Mon, 14 Feb 2011 14:40:23 GMT
Subject: Re: Consistent terminology: cached/staged/index
Message-ID: <m3ipwm8yv0.fsf@localhost.localdomain>
In-Reply-To: <AANLkTi=N7N31D09YoRQsGTntspUfZRjfNHQtVpUfRus_@mail.gmail.com>

Nguyen Thai Ngoc Duy <pclouds@gmail.com> writes:
> On Mon, Feb 14, 2011 at 9:17 PM, Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>> 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'.
> 
> It does. What if I want to stage a file named "add", "rm" or "diff"?

Then you would use

  $ git stage ./diff

or

  $ git stage -- diff

(or even "git add diff" ;-)).

P.S. I haven't checked that above work...

-- 
Jakub Narebski
Poland
ShadeHawk on #git