From: "H. Peter Anvin" <hpa@zytor.com>
To: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>
Subject: Cogito wishlist: ability to set merge strategy
Date: Mon, 16 Jan 2006 19:29:49 -0800 [thread overview]
Message-ID: <43CC64AD.30606@zytor.com> (raw)
It would be nice if Cogito would let one override the default merge
strategy, i.e. to use the recursive merge strategy. I've had some
moderate luck with using recursive merge for the klibc trees recently.
-hpa
next prev reply other threads:[~2006-01-17 3:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-18 14:53 "tla missing -s" equivalent with git/cogito Belmar-Letelier
2006-01-18 17:08 ` Andreas Ericsson
2006-01-18 17:46 ` Junio C Hamano
2006-01-18 18:06 ` Martin Langhoff
2006-01-17 3:29 ` H. Peter Anvin [this message]
2006-01-18 19:32 ` Cogito wishlist: ability to set merge strategy Petr Baudis
2006-01-18 20:14 ` Martin Langhoff
2006-01-18 17:56 ` "tla missing -s" equivalent with git/cogito Martin Langhoff
2006-01-18 18:55 ` Petr Baudis
2006-01-18 19:07 ` Martin Langhoff
2006-01-18 19:26 ` Petr Baudis
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=43CC64AD.30606@zytor.com \
--to=hpa@zytor.com \
--cc=git@vger.kernel.org \
--cc=pasky@ucw.cz \
/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).