From: Geoff Russell <geoffrey.russell@gmail.com>
Date: Mon, 26 Mar 2007 02:17:50 GMT
Subject: Re: Question regarding: git pull --no-commit origin
Message-ID: <93c3eada0703251917j3ed8702dvc622bb94a1e5e8af@mail.gmail.com>
In-Reply-To: <20070326014757.GA28592@coredump.intra.peff.net>

On 3/26/07, Jeff King <peff@peff.net> wrote:
> 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
>

Ok, that's all nice and clear now. Many thanks.

Geoff.