From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: --mixed option is deprecated with paths
Date: Sat, 14 Aug 2010 12:42:41 -0700 [thread overview]
Message-ID: <7v7hjthtfy.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <AANLkTik_NuG3YKMknwh4fAK09kTH0tK1f08MzsexUMcV@mail.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Sat\, 14 Aug 2010 15\:23\:04 +0000")
Æ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.
prev parent reply other threads:[~2010-08-14 19:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=7v7hjthtfy.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox