Re: Question regarding: git pull --no-commit origin

From: Jeff King <peff@peff.net>
Date: Mar 26, 2007, 01:47 UTC
Message-ID: <20070326014757.GA28592@coredump.intra.peff.net>
In-Reply-To: <93c3eada0703251816lc430e03l71ee2ffaa3d8796@mail.gmail.com>

On Mon, Mar 26, 2007 at 10:46:09AM +0930, Geoff Russell wrote:

Show 6 quoted lines

> 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