From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14731 invoked by alias); 30 Jul 2013 15:12:42 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31617 Received: (qmail 19375 invoked from network); 30 Jul 2013 15:12:28 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_PASS autolearn=ham version=3.3.2 Received-SPF: pass (ns1.primenet.com.au: SPF record at schrab.com designates 50.116.43.67 as permitted sender) Date: Tue, 30 Jul 2013 11:04:46 -0400 From: Aaron Schrab To: Nikolai Weibull Cc: =?iso-8859-1?Q?=D8ystein?= Walle , zsh-workers@zsh.org, m0viefreak.cm@googlemail.com Subject: Re: [PATCH 15/16] _git: git rm: make git rm --cached work as intended Message-ID: <20130730150446.GE13852@pug.qqx.org> Mail-Followup-To: Nikolai Weibull , =?iso-8859-1?Q?=D8ystein?= Walle , zsh-workers@zsh.org, m0viefreak.cm@googlemail.com References: <3debebad8c56f7f8ad681b7c0b4d226e33e5e011.1375006129.git.oystwa@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21+184 (ge45f29a) (2012-12-30) At 16:37 +0200 30 Jul 2013, Nikolai Weibull wrote: >If I understand --cached, it’s exactly like you described, and if you >specify --cached, you only want files actually modified in the index >to be completed. I may be wrong, but please clarify, as you seem to >be stating a tautology. No, all files in the index should be available for completion with `git rm --cached`, not just ones which have been modified. The original commit message reads fine to me, I don't see anything tautological about it. The --cached option for this command causes git to remove the file only from the index, and therefore the next commit. No attempt is made to remove the file from the file system if it exists there. This is often used to remove configuration files from the repository once people figure out that tracking those doesn't work well, without losing the copy stored in the working tree.