gitignore

I've been using git but still having confusion about the .gitignore file paths. So, what is the difference between the following two paths in .gitignore file? tmp/* public/documents/**/* I can understand that tmp/* will ignore all the files and folders inside it. Am I right? But what does that second line path mean? This depends on the behavior of your shell. Git doesn't do any work to determine how to expand these. In general, * matches any single file or folder: /a/*/z matches /a/b/z matches /a/c/z doesn't match /a/b/c/z ** matches any string of folders: /a/**/z matches /a/b/z matches /a/b/c

I have a gitignore file that makes git ignore *.dll files, and that is actually the behavior I want. However, if I want an exception ( i.e. to be able to commit foo.dll ), how can I achieve this? Use: *.dll #Exclude all dlls !foo.dll #Except for foo.dll From gitignore : An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become included again. If a negated pattern matches, this will override lower precedence patterns sources. Git ignores folders if you write: /js but it can't add exceptions if you do: !/js/jquery or !/js/jquery/ or !/js/jquery/

Is there a way to force git to add a file despite the .gitignore file? See man git-add : -f, --force Allow adding otherwise ignored files. So run this git add --force my/ignore/file.foo A-S Despite Daniel Böhmer's working solution, Ohad Schneider offered a better solution in a comment: If the file is usually ignored, and you force adding it - it can be accidentally ignored again in the future (like when the file is deleted, then a commit is made and the file is re-created. You should just un-ignore it in the .gitignore file like that: Unignore subdirectories of ignored directories in Git

I'm writing a short script with a few simple variables at the top of the page. I want to work on them with a friend, but we aren't sure how to manage the variables needing to be changed after pulling each time for one of us, adding unnecessary junk to git status. I thought about just creating different named branches for each of us, and then the master will just have example usernames set, but it seems silly to have to do all that extra work merging. We could have the variables passed to the script as options, but that isn't desired, nor is separating it out to another separate configuration

I'm confused about what's the correct way to ignore the contents of a directory in git. Assume I have the following directory structure: my_project |--www |--1.txt |--2.txt |--.gitignore What's the difference between putting this: www And this? www/* The reason I'm asking this question is: In git, if a directory is empty, git won't include such empty directory in repository. So I was trying the solution that is add an extra .gitkeep file under the directory so that it won't be empty. When I was trying that solution, if in the .gitignore file, I write like below: www !*.gitkeep It doesn't work

I'm trying to collect some of my default settings, and one thing I realized I don't have a standard for is .gitignore files. There's a great thread showing a good .gitignore for Visual Studio projects , but I don't see many recommendations for Python and related tools (PyGTK, Django). So far, I have... *.pyc *.pyo ...for the compiled objects and... build/ dist/ ...for the setuptools output. What are some best practices for .gitignore files, and where can I go for more about these best practices? When using buildout I have following in .gitignore (along with *.pyo and *.pyc ): .installed.cfg