From: Junio C Hamano <junkio@cox.net>
Date: Sat, 27 Jan 2007 00:03:27 GMT
Subject: Re: Problems with branches
Message-ID: <7vfy9xtjxs.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <4b73d43f0701261551oef411f7tfd5cdbfdce7f6abc@mail.gmail.com>

"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.