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

Re: need help with git show :1:...

From
Elijah Newren <newren@gmail.com>
Date
Apr 8, 2009, 18:38 UTC
Message-ID
<51419b2c0904081138o3f05a6fm6a4213e7b0f1db6f@mail.gmail.com>
In-Reply-To
<7685.1239215733@relay.known.net>
Hi,

On Wed, Apr 8, 2009 at 12:35 PM, layer <layer@known.net> wrote: <snip>

Show 7 quoted lines
>>> git merge-file current-sock other-sock base-sock
>
> Did you mean this?
>
>  git merge-file current-sock base-sock other-sock
>
> The man page seems to indicate that.
Oops, yeah, current then base then other, like the manpage says.
Previous: layer
Message 8 of 8 in “need help with git show :1:...”
  1. layerApr 8, 2009
  2. Elijah NewrenApr 8, 2009
  3. layerApr 8, 2009
  4. Elijah NewrenApr 8, 2009
  5. layerApr 8, 2009
  6. Elijah NewrenApr 8, 2009
  7. layerApr 8, 2009
  8. Elijah NewrenApr 8, 2009

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.