From: Junio C Hamano <gitster@pobox.com>
To: David Mandelberg <david@mandelberg.org>
Cc: git@vger.kernel.org
Subject: Re: git overwriting local ignored files?
Date: Sat, 24 Nov 2018 13:22:51 +0900 [thread overview]
Message-ID: <xmqqftvr2jfo.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <a852c0e9-f278-8e2a-406c-bb6099b2440c@mandelberg.org> (David Mandelberg's message of "Fri, 23 Nov 2018 21:35:05 -0500")
David Mandelberg <david@mandelberg.org> writes:
> It seems that git is overwriting my local files on merge if they're in
> .gitignore. See command transcript below. I searched `git help config`
> and Google, but I couldn't find any way to prevent it. Am I missing
> something? (The reason I care about ignored files is that I'm using
> git with a working directory of $HOME to manage my dotfiles, and most
> files in my $HOME are not tracked by git but are still important.)
The .gitignore file is to list "ignored and expendable" class of
files; there is no "ignored but precious class" in Git.
next prev parent reply other threads:[~2018-11-24 4:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-24 2:35 git overwriting local ignored files? David Mandelberg
2018-11-24 4:22 ` Junio C Hamano [this message]
2018-11-24 14:37 ` David Mandelberg
2018-11-24 14:57 ` Konstantin Khomoutov
2018-11-24 15:41 ` Konstantin Khomoutov
2018-11-25 2:06 ` David Mandelberg
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqftvr2jfo.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=david@mandelberg.org \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).