git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Converted git-merge-ours.sh -> builtin-merge-ours.c
Date: Fri, 23 Nov 2007 10:42:25 +0100	[thread overview]
Message-ID: <fi67a2$6jh$1@ger.gmane.org> (raw)
In-Reply-To: 4745E45C.7@gmail.com

Thomas Harning wrote:

> 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

      parent reply	other threads:[~2007-11-23  9:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-11-22 20:19 [PATCH] Converted git-merge-ours.sh -> builtin-merge-ours.c Thomas Harning
2007-11-23  8:49 ` Junio C Hamano
2007-11-23  9:42 ` Jakub Narebski [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='fi67a2$6jh$1@ger.gmane.org' \
    --to=jnareb@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).