Using git, how do I ignore a file in one branch but have it committed in another branch?

by

This solution appears to work only for certain, patched versions of git. See a new answer pointing to workarounds and another answer and subsequent comments for a hint which versions may work.

I wrote a blog post on how to effectively use the excludesfile for different branches, like one for public github and one for heroku deployment.

Here’s the quick and dirty: 

$ git branch public_viewing
$ cd .git/
$ touch info/exclude_from_public_viewing
$ echo "path/to/secret/file" > info/exclude_from_public_viewing

then in the .git/config file add these lines:

[core]
excludesfile = +info/exclude


[branch "public_viewing"]
excludesfile = +info/exclude_from_public_viewing

Now all the global ignore stuff is in the info/exclude file and the branch specific is in the info/exclude_from_public_viewing

Hope that helps!

http://cogniton-mind.tumblr.com/post/1423976659/howto-gitignore-for-different-branches

More Related Contents:

  1. How can I make Git "forget" about a file that was tracked, but is now in .gitignore?
  2. Ignore files that have already been committed to a Git repository [duplicate]
  3. Make .gitignore ignore everything except a few files
  4. .gitignore exclude folder but include specific subfolder
  5. Can I ‘git commit’ a file and ignore its content changes?
  6. What should be in my .gitignore for an Android Studio project?
  7. Global Git ignore
  8. How to ignore certain files in Git?
  9. How to tell git to ignore individual lines, i.e. gitignore for specific lines of code [duplicate]
  10. How do I tell Git to ignore everything except a subdirectory?
  11. Explain which gitignore rule is ignoring my file
  12. How can I stop .gitignore from appearing in the list of untracked files?
  13. .gitignore after commit [duplicate]
  14. git ignore vs. exclude vs. assume-unchanged
  15. How to remove files that are listed in the .gitignore but still on the repository?
  16. How to git ignore subfolders / subdirectories?
  17. Force add despite the .gitignore file
  18. Git is ignoring files that aren’t in gitignore
  19. gitignore binary files that have no extension
  20. How to manage configuration files when collaborating?
  21. Definitive retroactive .gitignore (how to make Git completely/retroactively forget about a file now in .gitignore)
  22. How to ignore all hidden directories/files recursively in a git repository?
  23. Is there a way to tell git to only include certain files instead of ignoring certain files?
  24. git ignore exception
  25. What to gitignore from the .idea folder?
  26. Why is .gitignore not ignoring my files?
  27. git ignore all files of a certain type, except those in a specific subfolder
  28. Git Ignores and Maven targets
  29. Can I include other .gitignore file in a .gitignore file? (like #include in c-like languages)
  30. Commit empty folder structure (with git) [duplicate]

Leave a Comment