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

Re: [PATCH 1/2] add tests for merge-index / merge-one-file

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 29, 2011, 06:25 UTC
Message-ID
<7vbozp376u.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4DBA56DF.5070000@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
> Am 4/29/2011 0:39, schrieb Jeff King:
>> +	sed s/2/two/ <file >tmp &&
>
> You are not using -e; will all seds out there grok this?
That should be Ok, as long as the script is not ambiguous.
Previous: Johannes SixtNext: Jeff King
Message 4 of 6 in “merge-one-file and GIT_WORK_TREE”
  1. 0/2 merge-one-file and GIT_WORK_TREEJeff King, Apr 28, 2011
  2. 1/2 add tests for merge-index / merge-one-fileJeff King, Apr 28, 2011
  3. Johannes SixtApr 29, 2011
  4. Junio C HamanoApr 29, 2011
  5. 2/2 merge-one-file: fix broken merges with GIT_WORK_TREEJeff King, Apr 28, 2011
  6. Junio C HamanoApr 29, 2011

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.