Re: Problems with branches

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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

On 1/26/07, Junio C Hamano <junkio@xxxxxxx> wrote:
"John Rigby" <jcrigby@xxxxxxxxx> 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.


-
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

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]