From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] More permissive "git-rm --cached" behavior without -f.
Date: Sat, 14 Jul 2007 02:44:14 +0200 [thread overview]
Message-ID: <f7968s$j44$1@sea.gmane.org> (raw)
In-Reply-To: 11843484982037-git-send-email-Matthieu.Moy@imag.fr
Matthieu Moy wrote:
> In the previous behavior, "git-rm --cached" (without -f) had the same
> restriction as "git-rm". This forced the user to use the -f flag in
> situations which weren't actually dangerous, like:
>
> $ git add foo # oops, I didn't want this
> $ git rm --cached foo # back to initial situation
>
> Previously, the index had to match the file *and* the HEAD. With
> --cached, the index must now match the file *or* the HEAD. The behavior
> without --cached is unchanged, but provides better error messages.
Sensible.
There might be some discussion if what git-rm without --cached does
is right, but that is besides scope of this patch.
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-07-14 0:44 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-02 18:09 git-rm isn't the inverse action of git-add Christian Jaeger
2007-07-02 19:42 ` Yann Dirson
2007-07-02 20:23 ` Christian Jaeger
2007-07-02 20:40 ` Yann Dirson
2007-07-02 20:54 ` Matthieu Moy
2007-07-02 21:05 ` Johannes Schindelin
2007-07-03 10:37 ` Matthieu Moy
2007-07-03 12:09 ` Johannes Schindelin
2007-07-03 13:40 ` Matthieu Moy
2007-07-03 14:21 ` Johannes Schindelin
2007-07-04 20:08 ` Jan Hudec
2007-07-05 13:44 ` Matthieu Moy
2007-07-05 14:00 ` David Kastrup
2007-07-08 17:36 ` [RFC][PATCH] " Matthieu Moy
2007-07-08 18:10 ` Johannes Schindelin
2007-07-08 20:34 ` Matthieu Moy
2007-07-08 21:49 ` Johannes Schindelin
2007-07-09 9:45 ` Matthieu Moy
2007-07-13 17:36 ` Matthieu Moy
2007-07-13 17:41 ` [PATCH] More permissive "git-rm --cached" behavior without -f Matthieu Moy
2007-07-13 17:57 ` Jeff King
2007-07-13 18:53 ` Matthieu Moy
2007-07-14 3:42 ` Jeff King
2007-07-14 0:44 ` Jakub Narebski [this message]
2007-07-14 6:52 ` Junio C Hamano
2007-07-14 7:16 ` Junio C Hamano
2007-07-14 10:14 ` Matthieu Moy
2007-07-02 21:20 ` git-rm isn't the inverse action of git-add Christian Jaeger
2007-07-03 4:12 ` Jeff King
2007-07-03 4:47 ` Junio C Hamano
2007-07-03 4:59 ` Jeff King
2007-07-03 5:09 ` Junio C Hamano
2007-07-03 5:12 ` Jeff King
2007-07-03 6:26 ` Junio C Hamano
2007-07-11 12:20 ` Jakub Narebski
2007-07-11 18:56 ` Jan Hudec
2007-07-11 21:26 ` Junio C Hamano
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='f7968s$j44$1@sea.gmane.org' \
--to=jnareb@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;
as well as URLs for NNTP newsgroup(s).