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

Re: [PATCH] Add builtin merge-file, a minimal replacement for RCS merge

From
Jakub Narebski <jnareb@gmail.com>
Date
Dec 6, 2006, 15:30 UTC
Message-ID
<el6nhv$58n$1@sea.gmane.org>
In-Reply-To
<Pine.LNX.4.63.0612061609430.28348@wbgn013.biozentrum.uni-wuerzburg.de>
Johannes Schindelin wrote:
> merge-file has the same syntax as RCS merge, but supports only the
> "-L" option.

Would it be hard to add "-p / --stdout" options, and "-q / --quiet" option? I understand that non-standard output format options are rather out of question...

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 3 of 4 in “Add builtin merge-file, a minimal replacement for RCS merge”
  1. Add builtin merge-file, a minimal replacement for RCS mergeJohannes Schindelin, Dec 6, 2006
  2. Johannes SchindelinDec 6, 2006
  3. Jakub NarebskiDec 6, 2006
  4. merge-file: support -p and -q; fix compile warningsJohannes Schindelin, Dec 6, 2006

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.