GitHub – Adding a Description to a Repository

Generally, all config data like passwords and database info will be kept in a config file. To keep private data safe, I usually:

• Create an example config file that is hosted with the project
• Provide documentation on modifying the example to be the actual config (rename the file, replace variables, etc.)
• Add the actual config file to .gitignore so that it is not a tracked file

Those are my thoughts ...

You should be able to just pull down the other repo and have it merge with yours.

git pull {url-of-repo-with-commit-you-want-to-merge-in}

This will fetch the repo mentioned and have it automatically fast forward merge in any commits you don't have into yours.

So in your example, while on your master branch, or if you want to test it out on some other branch:

git pull git://github.com/dantipa/history.js.git
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (1/1), done.
remote: Total 5 (delta 4), reused 5 (delta 4)
Unpacking objects: 100% (5/5), done.
From git://github.com/dantipa/history.js
 * branch            HEAD       -> FETCH_HEAD
Updating e84ad00..e2d5251
Fast-forward
 scripts/uncompressed/history.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Now with the other commit merged with yours you can push back up to your own remote with that extra change.