gistfile1.txt

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	ignorecase = true
[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = git@github.com:g1nn13/jakarta
[branch "master"]
	remote = origin
	merge = refs/heads/master
[remote "mattd"]
	fetch = +refs/heads/*:refs/remotes/mattd/*
	url = git@github.com:mattd/jakarta

gistfile2.txt

# common workflow

# get most recent changes from g1nn13
git fetch
git merge origin/master

# make a new topic branch
git checkout -b new-modal

# do some work

# check in your work
git commit -am "Make the modal more better."

# either merge locally...
git checkout master
git merge new-modal

# ...and push to your repo's master
git push mattd master

# then submit a pull request for master -> master

# ...or push your topic branch to github
git push mattd new-modal

# then submit a pull request for new-modal -> master