* --mixed option is deprecated with paths
@ 2010-08-14 15:23 Ævar Arnfjörð Bjarmason
2010-08-14 18:40 ` Ralf Ebert
2010-08-14 19:42 ` Junio C Hamano
0 siblings, 2 replies; 5+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-08-14 15:23 UTC (permalink / raw)
To: Git Mailing List
$ git reset --mixed t/Makefile
warning: --mixed option is deprecated with paths.
Unstaged changes after reset:
M t/Makefile
So what should I use instead? 0e5a7faa which introduced it doesn't say.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: --mixed option is deprecated with paths
2010-08-14 15:23 --mixed option is deprecated with paths Ævar Arnfjörð Bjarmason
@ 2010-08-14 18:40 ` Ralf Ebert
2010-08-14 18:55 ` Ævar Arnfjörð Bjarmason
2010-08-14 19:42 ` Junio C Hamano
1 sibling, 1 reply; 5+ messages in thread
From: Ralf Ebert @ 2010-08-14 18:40 UTC (permalink / raw)
To: git
On 14.08.2010 17:23, Ævar Arnfjörð Bjarmason wrote:
> So what should I use instead? 0e5a7faa which introduced it doesn't say.
It doesn't currently exist, but I'm pretty sure it should be called 'git
unstage' :)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --mixed option is deprecated with paths
2010-08-14 18:40 ` Ralf Ebert
@ 2010-08-14 18:55 ` Ævar Arnfjörð Bjarmason
2010-08-14 19:12 ` Ralf Ebert
0 siblings, 1 reply; 5+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2010-08-14 18:55 UTC (permalink / raw)
To: Ralf Ebert; +Cc: git
On Sat, Aug 14, 2010 at 18:40, Ralf Ebert <info@ralfebert.de> wrote:
> On 14.08.2010 17:23, Ævar Arnfjörð Bjarmason wrote:
>>
>> So what should I use instead? 0e5a7faa which introduced it doesn't say.
>
> It doesn't currently exist, but I'm pretty sure it should be called 'git
> unstage' :)
Then perhaps it should be undeprecated? If what you say is correct
it's been whining about that since 2007 with no alternative, while
doing what I mean when I run it.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --mixed option is deprecated with paths
2010-08-14 18:55 ` Ævar Arnfjörð Bjarmason
@ 2010-08-14 19:12 ` Ralf Ebert
0 siblings, 0 replies; 5+ messages in thread
From: Ralf Ebert @ 2010-08-14 19:12 UTC (permalink / raw)
To: git
On 14.08.2010 20:55, Ævar Arnfjörð Bjarmason wrote:
> On Sat, Aug 14, 2010 at 18:40, Ralf Ebert<info@ralfebert.de> wrote:
>> On 14.08.2010 17:23, Ævar Arnfjörð Bjarmason wrote:
>>>
>>> So what should I use instead? 0e5a7faa which introduced it doesn't say.
>>
>> It doesn't currently exist, but I'm pretty sure it should be called 'git
>> unstage' :)
>
> Then perhaps it should be undeprecated? If what you say is correct
> it's been whining about that since 2007 with no alternative, while
> doing what I mean when I run it.
Sorry, I misremembered '--mixed' again, '--mixed' is the default and it
doesn't complain if you just omit it, and if I read&tried right, 'git
reset <file>' does the same as 'git reset --mixed <file>'.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: --mixed option is deprecated with paths
2010-08-14 15:23 --mixed option is deprecated with paths Ævar Arnfjörð Bjarmason
2010-08-14 18:40 ` Ralf Ebert
@ 2010-08-14 19:42 ` Junio C Hamano
1 sibling, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2010-08-14 19:42 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Git Mailing List
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> $ git reset --mixed t/Makefile
> warning: --mixed option is deprecated with paths.
> Unstaged changes after reset:
> M t/Makefile
>
> So what should I use instead? 0e5a7faa which introduced it doesn't say.
You should say nothing. "git reset [<commit>] <path>" is about resetting
the index entry selectively, and there is no room for any mode to be
involved (iow "git reset --soft t/Makefile" does not make any sense),
hence deprecation.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-08-14 19:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-14 15:23 --mixed option is deprecated with paths Ævar Arnfjörð Bjarmason
2010-08-14 18:40 ` Ralf Ebert
2010-08-14 18:55 ` Ævar Arnfjörð Bjarmason
2010-08-14 19:12 ` Ralf Ebert
2010-08-14 19:42 ` Junio C Hamano
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.