In my use case (developing using an edited config file on my personal machine, running on another machine with the unchanged config), this was the solution for me: start ignoring changes to a file: git update-index –assume-unchanged path/to/file keep tracking again: git update-index –no-assume-unchanged path/to/file
Just run: $ git submodule update This will revert the submodule the to old commit (specified in parent-repo), without updating the parent-repo with the latest version of the submodule.
As of version 2012.1, Perforce supports the P4IGNORE environment variable. I updated my answer to this question about ignoring directories with an explanation of how it works. Then I noticed this answer, which is now superfluous I guess. Assuming you have a client named “CLIENT”, a directory named “foo” (located at your project root), and … Read more
As of subversion 1.8, there is now the svn:global-ignores property which works like svn:ignore but recursively (so set this on your top-level directory)
There is no special git ignore command. Edit a .gitignore file located in the appropriate place within the working copy. You should then add this .gitignore and commit it. Everyone who clones that repo will than have those files ignored. Note that only file names starting with / will be relative to the directory .gitignore … Read more
I know this is old but in case anyone else stumbles upon it, newer versions (1.9 or later) of svn support –remove-unversioned, e.g. svn cleanup . –remove-unversioned. https://subversion.apache.org/docs/release-notes/1.9.html#svn-cleanup-options
I got over this issue by using git merge command with the –no-commit option and then explicitly removed the staged file and ignore the changes to the file. E.g.: say I want to ignore any changes to myfile.txt I proceed as follows: git merge –no-ff –no-commit <merge-branch> git reset HEAD myfile.txt git checkout — myfile.txt … Read more
check out the git-update-index man page and the –assume-unchanged bit and related. when I have your problem I do this git update-index –assume-unchanged dir-im-removing/ or a specific file git update-index –assume-unchanged config/database.yml
This is how you can kind of do it with git filters: Create/Open gitattributes file: <project root>/.gitattributes (will be committed into repo) OR <project root>/.git/info/attributes (won’t be committed into repo) Add a line defining the files to be filtered: *.rb filter=gitignore, i.e. run filter named gitignore on all *.rb files Define the gitignore filter in … Read more
Vim temporary files end with ~ so you can add to the file .gitignore the line *~ Vim also creates swap files that have the swp and swo extensions. to remove those use the lines: *.swp *.swo This will ignore all the vim temporary files in a single project If you want to do it … Read more