On Mon, Mar 26, 2007 at 10:46:09AM +0930, Geoff Russell wrote: > If --no-commit won't let me do this then perhaps I need something like: > > git pull origin:testing > git checkout testing > .... test > git checkout master ; git pull . testing Close. Remember that a pull is basically a fetch + merge; so your first command is just the fetch: # fetches everything from origin git fetch # see what they have that we don't git whatchanged HEAD..origin/testing # check out their code in more detail git checkout origin/testing # or even make our own branch in case we have tweaks to make git checkout -b testing origin/testing # and once we're OK, do the merge git checkout master; git merge origin/testing All of that assumes git 1.5 or greater, which uses the separate remote layout and has some interface improvements. For older versions, their 'testing' branch will be pulled into your 'testing' branch, and I believe you will need to 'git pull . testing' to merge it. -Peff - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html