From: Arup Rakshit <aruprakshit@rocketmail.com>
To: git@vger.kernel.org
Subject: Re: git pull not ignoring the file which has been sent to the temporary ignore list
Date: Sat, 24 Jan 2015 10:20:46 +0630 [thread overview]
Message-ID: <1557175.bcUxN10iZq@linux-wzza.site> (raw)
In-Reply-To: <xmqq8ugtqjxg.fsf@gitster.dls.corp.google.com>
On Friday, January 23, 2015 01:14:03 PM you wrote:
> Stefan Beller <sbeller@google.com> writes:
>
> >> Ok. How should I then ignore any local changes to the .gitignore
> >> file ? And while taking pull, git should skip this file ?
> >
> > Look at .git/info/exclude
>
> Good answer for ".gitignore". In general, you do not "ignore local
> changes" to tracked paths.
There are some configuration files, like `database.yml`, where we generally put our local DB credentials and we don't want to share such things. That's why we always put related settings inside the .gitignore file. But while I will change it, git will not track the changes of the file, but .gitignore. That's why I used the first thread command. But when the time the came to take a `git pull`, I got to know about the mess. What should be the ideal decision in this case ?
> > I found https://help.github.com/articles/ignoring-files/ as Googles
> > first hit, which advises to use
> > git update-index --assume-unchanged path/to/file.txt
> > Not sure if that is most helpful advice there.
Yes, I followed the same.
> The piece of advice in the last paragraph on that page is wrong (and
> it has been wrong from the day it was written).
>
> The gitignore(5) documentation used to have a similar incorrect
> piece of advice but we finally corrected it recently.
>
> Cf. http://thread.gmane.org/gmane.comp.version-control.git/260954/focus=261118
--
================
Regards,
Arup Rakshit
================
Debugging is twice as hard as writing the code in the first place. Therefore, if you write the code as cleverly as possible, you are, by definition, not smart enough to debug it.
--Brian Kernighan
next prev parent reply other threads:[~2015-01-24 4:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-23 18:27 git pull not ignoring the file which has been sent to the temporary ignore list Arup Rakshit
2015-01-23 19:31 ` Junio C Hamano
2015-01-23 18:35 ` Arup Rakshit
2015-01-23 20:12 ` Stefan Beller
2015-01-23 21:14 ` Junio C Hamano
2015-01-23 21:38 ` Stefan Beller
2015-01-23 22:26 ` Junio C Hamano
2015-01-23 22:32 ` Stefan Beller
2015-01-24 3:50 ` Arup Rakshit [this message]
2015-01-24 11:03 ` Kevin
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=1557175.bcUxN10iZq@linux-wzza.site \
--to=aruprakshit@rocketmail.com \
--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).