From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Miklos Vajna <vmiklos@frugalware.org>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: Question about git-merge-stupid
Date: Thu, 03 Jul 2008 16:54:31 -0700 [thread overview]
Message-ID: <7v4p76y154.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: alpine.LFD.1.10.0807030947360.18105@woody.linux-foundation.org
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Well, see above. I think there's a reason why -stupid isn't even worth
> documenting. It might be better off just removed.
It is called stupid for a reason ;-).
It has been sitting there as an example for a long time, and I do
not think anybody minds removing it.
next prev parent reply other threads:[~2008-07-03 23:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-03 12:33 Question about git-merge-stupid Miklos Vajna
2008-07-03 17:08 ` Linus Torvalds
2008-07-03 23:18 ` [RFC/PATCH] Remove 'stupid' merge strategy Miklos Vajna
2008-07-03 23:54 ` Junio C Hamano [this message]
2008-07-04 0:07 ` Question about git-merge-stupid Miklos Vajna
2008-07-05 14:43 ` [PATCH] Move 'stupid' merge strategy to contrib Miklos Vajna
2008-07-05 21:00 ` Miklos Vajna
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=7v4p76y154.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=vmiklos@frugalware.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).