git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Problems with branches

From
Junio C Hamano <junkio@cox.net>
Date
Jan 27, 2007, 00:03 UTC
Message-ID
<7vfy9xtjxs.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<4b73d43f0701261551oef411f7tfd5cdbfdce7f6abc@mail.gmail.com>
"John Rigby" <jcrigby@gmail.com> writes:
Show 6 quoted lines
> + 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.

Previous: Johannes SchindelinNext: John Rigby
Message 3 of 6 in “Problems with branches”
  1. John RigbyJan 26, 2007
  2. Johannes SchindelinJan 27, 2007
  3. Junio C HamanoJan 27, 2007
  4. John RigbyJan 27, 2007
  5. Jeff KingJan 27, 2007
  6. Junio C HamanoJan 27, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.