I am building a Rails app that I manage with Git. All is perfect, but I'd like keep a public version as well as a private one. That is:

* the public version is for a public repository (for people to use),
* and the private version is for my own site.

The idea is that both versions should be up-to-date, with the difference that my private version's files contain passwords for my site, and the public version doesn't (or contains some default values as such).

I've been thinking of branches: `master` (the public version) and some private one.  

But it seems that I'd have to do a lot of merging after each commit.

Please, bear in mind, that I am a asking for I am still quite a noob at git.

Thanks folks!