If you've made some local changes, you'll often want to rebase your local commits on top of the most recent upstream:

git pull -r upstream master

You might want to test that in a new branch first.

Get latest patches from other developer's branch

First you need to add his/her own repo to your remote repo list:

git remote add NAME REPO_ADDR

Where NAME is the alias name you want to give for the remote repo, for example:

git remote add dpavlin git://github.com/dpavlin/kindlepdfviewer.git

You can verify the remote repo is successfully added by using:

git remote -v show

Now you can merge their branch to your local branch. But before you do this, I recommend you create a new branch first and do experimental stuff on top of the new branch so you won't mess with the master branch:

Submitting code change

How to submit my change on top of current development (which is master branch at origin).

This assumes that your repository clone have origin which points to upstream official repository as shown below. If you did checkout from your forked copy, and origin points to your local fork, you can always add another remote and replace origin in this instructions with another remote name.

dpavlin$ git commit --author NuPogodi -m 'TOC position on current place in the tree #235'
[issue-235-toc-position 25edd31] TOC position on current place in the tree #235
Author: NuPogodi <[email protected]>
1 file changed, 9 insertions(+), 5 deletions(-)
dpavlin$ git show

verify that commit looks sane, if I wasn't happy I would do git --commit --amend