git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Arup Rakshit <aruprakshit@rocketmail.com>
To: git@vger.kernel.org
Subject: git pull not ignoring the file which has been sent to the temporary ignore list
Date: Sat, 24 Jan 2015 00:57:30 +0630	[thread overview]
Message-ID: <3278910.5D06XWKxyS@linux-wzza.site> (raw)

Hi,

I asked git not to track any changes to the file .gitignore. To do so I did use the command - git update-index --assume-unchanged .gitignore.

[arup@sztukajedzenia]$ git status
# On branch MajorUpgrade
# Your branch is behind 'origin/MajorUpgrade' by 4 commits, and can be fast-forwarded.
#   (use "git pull" to update your local branch)
#
nothing to commit, working directory clean
[arup@sztukajedzenia]$ git pull origin MajorUpgrade
From rubyxcube.co.uk:sztuka-jedzenia/sztukajedzenia
 * branch            MajorUpgrade -> FETCH_HEAD
Updating 59a1c07..d7b9cd3
error: Your local changes to the following files would be overwritten by merge:
        .gitignore
Please, commit your changes or stash them before you can merge.
Aborting
[arup@sztukajedzenia]$

But you can see above, while I am taking `pull`, it is considering the file .gitignore. How should I tell `git pull` also not to consider the change the file, and skip it or something else ?

-- 
================
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

             reply	other threads:[~2015-01-23 19:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-23 18:27 Arup Rakshit [this message]
2015-01-23 19:31 ` git pull not ignoring the file which has been sent to the temporary ignore list 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
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=3278910.5D06XWKxyS@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).