git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
To: git@vger.kernel.org
Subject: Re: [PATCH] make 'git add' a first class user friendly interface to the index
Date: Sat, 02 Dec 2006 15:51:01 +0100	[thread overview]
Message-ID: <457192D5.8090209@xs4all.nl> (raw)
In-Reply-To: <ekrjc9$8uc$1@sea.gmane.org>

Jakub Narebski escreveu:
> Junio C Hamano wrote:
> 
>> By the way, aren't people disturbed that "git rm" does not
>> default to "-f" -- I rarely use the command myself but that
>> makes it feel even more awkward that "git rm foo" does not
>> remove the file "foo".
> 
> But _only_ if file is unmodified. I think that "git rm" meaning
> "remove this file from version control, but not from working area"
> is a good thing; if you want to remove file, just /usr/bin/rm it.

In my workflow,  I regularly get bitten by this: 

I do 

  git checkout devel
  git rm src/foo.cc
  git commit src/foo.cc    # or whatever -a -i --difficult option is necessary

  git checkout stable

     ...barf: trying to overwrite untracked src/foo.cc file..


I think for the default to remove from the working area is better. 

FWIW, I consider it annoyance with CVS as well 

-- 
 Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen

  reply	other threads:[~2006-12-02 14:51 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-01 20:06 [PATCH] make 'git add' a first class user friendly interface to the index Nicolas Pitre
2006-12-01 22:31 ` Junio C Hamano
2006-12-02  0:18   ` Alan Chandler
2006-12-02  2:01     ` Nicolas Pitre
2006-12-02  3:05   ` Nicolas Pitre
2006-12-02  6:54   ` Carl Worth
2006-12-02  7:54     ` Junio C Hamano
2006-12-02  9:06       ` Carl Worth
2006-12-02 10:11       ` Jakub Narebski
2006-12-02 14:51         ` Han-Wen Nienhuys [this message]
2006-12-02  8:28     ` Alan Chandler
2006-12-02 16:49       ` Carl Worth
2006-12-02 17:12         ` Jakub Narebski
2006-12-02 18:05         ` Alan Chandler
2006-12-03  4:04           ` Nicolas Pitre
2006-12-03  4:22         ` Nicolas Pitre
2006-12-03  4:34       ` Nicolas Pitre
2006-12-02  9:52   ` Jakub Narebski
2006-12-03  5:03   ` Nicolas Pitre
2006-12-03  5:33 ` [PATCH v2] " Nicolas Pitre
2006-12-03  9:16   ` Alan Chandler

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=457192D5.8090209@xs4all.nl \
    --to=hanwen@xs4all.nl \
    --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).