Re: Problems with branches

From: John Rigby <jcrigby@gmail.com>
Date: Jan 27, 2007, 00:08 UTC
Message-ID: <4b73d43f0701261608i15fda894k904df8c7263a58eb@mail.gmail.com>
In-Reply-To: <7vfy9xtjxs.fsf@assigned-by-dhcp.cox.net>

Doh!  Thanks, I didn't realize that this was a 1.5 thing.

On 1/26/07, Junio C Hamano <junkio@cox.net> wrote:

Show 20 quoted lines

> "John Rigby" <jcrigby@gmail.com> writes:
>
> > + git-merge mybranch
> > fatal: Needed a single revision
> > Usage: /home/jrigby/bin/git-merge [-n] [--no-commit] [--squash] [-s
> > <strategy>]... <merge-message> <head> <remote>+
> >
> > Could some kind soul help me pull my head out?
>
> Probably you are using v1.4.4.X.
>
> The change to make git-merge accessible as the first level UI
> happened during the preparation for the upcoming v1.5.0, and is
> available only in v1.5.0-rc0 and newer versions (the latest is
> at v1.5.0-rc2).
>
> If you replace "git-merge mybranch" with "git-pull . mybranch"
> you should be Ok.
>
>