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

Re: [PATCH] Converted git-merge-ours.sh -> builtin-merge-ours.c

From
Jakub Narebski <jnareb@gmail.com>
Date
Nov 23, 2007, 09:42 UTC
Message-ID
<fi67a2$6jh$1@ger.gmane.org>
In-Reply-To
<4745E45C.7@gmail.com>
Thomas Harning wrote:
Show 5 quoted lines
> diff --git a/git-merge-ours.sh b/git-merge-ours.sh
> deleted file mode 100755
> index c81a790..0000000
> --- a/git-merge-ours.sh
> +++ /dev/null

Shouldn't script version be moved to contrib/examples/ as is git.git policy, or is it too simple script?

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Previous: Junio C Hamano
Message 3 of 3 in “Converted git-merge-ours.sh -> builtin-merge-ours.c”
  1. Converted git-merge-ours.sh -> builtin-merge-ours.cThomas Harning, Nov 22, 2007
  2. Junio C HamanoNov 23, 2007
  3. Jakub NarebskiNov 23, 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.