From: Johannes Sixt <j6t@kdbg.org>
To: John Keeping <john@keeping.me.uk>
Cc: Peter Lauri <peterlauri@gmail.com>, git@vger.kernel.org
Subject: Re: .gitignore behavior on Mac
Date: Sat, 18 May 2013 23:01:13 +0200 [thread overview]
Message-ID: <5197EC19.8080806@kdbg.org> (raw)
In-Reply-To: <20130518185507.GI27005@serenity.lan>
Am 18.05.2013 20:55, schrieb John Keeping:
> On Sat, May 18, 2013 at 08:43:57PM +0200, Peter Lauri wrote:
>> But I just don't want to see that darn file. It is a config file that
>> I have changed, and I don't want to need to stash it for each "git
>> svn" action I want to perform... Any solution for that?
>
> Read about --assume-unchanged in git-update-index(1).
Beware!! --assume-unchanged is a promise not to modify a file, but that
is not true in this case, because it *was* modified. It might hide the
file from the git-status output, but then git might do something
unexpected sometimes, because a promise was not kept.
See last paragraph of
http://article.gmane.org/gmane.comp.version-control.git/146353
-- Hannes
next prev parent reply other threads:[~2013-05-18 21:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-18 18:36 .gitignore behavior on Mac Peter Lauri
2013-05-18 18:41 ` John Keeping
2013-05-18 18:43 ` Peter Lauri
2013-05-18 18:55 ` John Keeping
2013-05-18 21:01 ` Johannes Sixt [this message]
2013-05-18 22:37 ` Peter Lauri
2013-05-19 7:47 ` Junio C Hamano
2013-05-19 10:54 ` Antony Male
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=5197EC19.8080806@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peterlauri@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.