From: Dmitry Torokhov <dtor_core@ameritech.net>
To: git@vger.kernel.org
Cc: Petr Baudis <pasky@suse.cz>,
"Martin Langhoff (CatalystIT)" <martin@catalyst.net.nz>
Subject: Re: LCA2006 Git/Cogito tutorial
Date: Thu, 20 Oct 2005 21:37:21 -0500 [thread overview]
Message-ID: <200510202137.22311.dtor_core@ameritech.net> (raw)
In-Reply-To: <20051021005145.GB30889@pasky.or.cz>
On Thursday 20 October 2005 19:51, Petr Baudis wrote:
> (ii) You say:
>
> - Very fast stupid merge
> ... and very smart, slow merges when stupid won't do
>
He might be referring to manual merge which is indeed as smart as it gets :)
--
Dmitry
next prev parent reply other threads:[~2005-10-21 2:37 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-17 0:48 LCA2006 Git/Cogito tutorial Martin Langhoff (CatalystIT)
2005-10-21 0:51 ` Petr Baudis
2005-10-21 2:37 ` Dmitry Torokhov [this message]
2005-10-21 2:59 ` Martin Langhoff (CatalystIT)
2005-10-21 9:15 ` Petr Baudis
2005-10-23 15:35 ` Horst von Brand
2005-10-23 22:39 ` Petr Baudis
2005-10-24 8:32 ` Fredrik Kuivinen
2005-10-23 15:33 ` Horst von Brand
2005-10-23 22:40 ` Petr Baudis
2005-10-24 0:22 ` Horst von Brand
2005-10-24 6:25 ` Martin Langhoff
2005-10-24 0:58 ` Junio C Hamano
2005-10-24 1:35 ` Linus Torvalds
2005-10-24 1:48 ` Junio C Hamano
2005-10-24 3:32 ` Linus Torvalds
2005-10-24 7:54 ` Petr Baudis
2005-10-24 9:44 ` Junio C Hamano
2005-10-24 15:04 ` Linus Torvalds
2005-10-21 3:02 ` Martin Langhoff (CatalystIT)
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=200510202137.22311.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=git@vger.kernel.org \
--cc=martin@catalyst.net.nz \
--cc=pasky@suse.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.