Ævar Arnfjörð Bjarmason $ git reset --mixed t/Makefile
warning: --mixed option is deprecated with paths.
Unstaged changes after reset:
M t/MakefileSo what should I use instead? 0e5a7faa which introduced it doesn't say.
threads / discuss / 24742
--mixed option is deprecated with paths
Subject: --mixed option is deprecated with paths
Ævar Arnfjörð Bjarmason
Ralf EbertRe: --mixed option is deprecated with paths
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' :)
Ævar Arnfjörð BjarmasonRe: --mixed option is deprecated with paths
On Sat, Aug 14, 2010 at 18:40, Ralf Ebert <info@ralfebert.de> wrote:
Show 6 quoted lines
> 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.
Ralf EbertRe: --mixed option is deprecated with paths
On 14.08.2010 20:55, Ævar Arnfjörð Bjarmason wrote:
Show 11 quoted lines
> 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>'.
Junio C HamanoRe: --mixed option is deprecated with paths
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 6 quoted lines
> $ 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.