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

Re: [PATCH 1/3] merge-file: add option to specify the marker size

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 28, 2010, 20:13 UTC
Message-ID
<7viq9h3yql.fsf@alter.siamese.dyndns.org>
In-Reply-To
<972adf380be481b5e8d031481586e9c34da2cbb7.1267385538.git.bert.wesarg@googlemail.com>
Bert Wesarg <bert.wesarg@googlemail.com> writes:
Show 8 quoted lines
> Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
>
> ---
>
> This can probably improved in a way, that the marker size will be taken
> from attributes. This could be done by an explicit --marker-size-by-path
> option or an option which names one of the three input files as a git
> path.

You don't want any option that is specifically about "marker size". An option to specify the path to take attributes for would be the right way to go. You might want to see "hash-object --path" for an inspiration.

Previous: Bert WesargNext: Bert Wesarg
Message 9 of 10 in “merge-file: add option to specify the marker size”
  1. 1/3 merge-file: add option to specify the marker sizeBert Wesarg, Feb 28, 2010
  2. 2/3 make union merge an xdl merge favorBert Wesarg, Feb 28, 2010
  3. Junio C HamanoFeb 28, 2010
  4. Bert WesargMar 1, 2010
  5. Junio C HamanoMar 1, 2010
  6. Bert WesargMar 1, 2010
  7. Junio C HamanoMar 1, 2010
  8. 3/3 refactor merge flags into xmparam_tBert Wesarg, Feb 28, 2010
  9. Junio C HamanoFeb 28, 2010
  10. Bert WesargMar 1, 2010

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.