git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: list@phuk.ath.cx
To: git@vger.kernel.org
Subject: git rm --cached and pull semantics
Date: Sat, 16 Jan 2010 17:50:01 +0100	[thread overview]
Message-ID: <4B51EE39.3010401@phuk.ath.cx> (raw)

Hello everyone,

I'm trying to manage and distribute a subset of /etc with git.
Therefore, I have * in .gitignore and use git add -f to add files. Now
sometimes I want to un-track a file that has been in previous commits,
but naturally I don't want the file deleted. I just want git to ignore
it again. As I read it, the way to do that is "git rm --cached $file".
On the local working tree, that works as expected, but when some remote
machine pulls a subsequent commit, it deletes the file from its working
tree. But I just want git to ignore the file again, just as it does in
the origin repo. How can I do that?

thanks for your time

             reply	other threads:[~2010-01-16 16:57 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-16 16:50 list [this message]
2010-01-17 11:42 ` git rm --cached and pull semantics Matthieu Moy
2010-01-17 22:50   ` list
2010-01-18  0:06     ` Randal L. Schwartz
2010-01-18  2:31       ` list

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=4B51EE39.3010401@phuk.ath.cx \
    --to=list@phuk.ath.cx \
    --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).