From: Martin Langhoff <martin.langhoff@gmail.com>
To: Git Mailing List <git@vger.kernel.org>, Petr Baudis <pasky@ucw.cz>
Subject: Fwd: cg-merge should use git-merge
Date: Thu, 20 Oct 2005 00:21:47 +1300 [thread overview]
Message-ID: <46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com> (raw)
In-Reply-To: <46a038f90510161644l35119401rdc05c081506ae715@mail.gmail.com>
Resending a post that never made it to the list due to a bug at my
end, and I think warrants some more discussion. Unfortunately, I'm
bug-fixing at the moment, so implementing this has taken a backseat.
---------- Forwarded message ----------
From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Oct 17, 2005 12:44 PM
Subject: cg-merge should use git-merge
To: Petr Baudis <pasky@ucw.cz>, Git Mailing List <git@vger.kernel.org>
Petr,
After using git-merge a few times by hand to test-drive the new merge
drivers, I'm sold on the idea, and I 'd like to have cg-merge use
git-merge directly. I'll try and find the time one of these evenings
to outline something, but I guess it's pretty core to Cogito, so I'm
after some direction from you ;)
martin
next prev parent reply other threads:[~2005-10-19 11:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <46a038f90510161644l35119401rdc05c081506ae715@mail.gmail.com>
[not found] ` <46a038f90510161744m7e95303eu8a9942363ffc58a6@mail.gmail.com>
2005-10-17 8:31 ` cg-merge should use git-merge Junio C Hamano
[not found] ` <46a038f90510170203ndee2b2bi913b62014614f68e@mail.gmail.com>
2005-10-17 9:26 ` Junio C Hamano
2005-10-19 11:21 ` Martin Langhoff [this message]
2005-10-20 7:04 ` Martin Langhoff
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=46a038f90510190421l50b2c12k495db23b62015782@mail.gmail.com \
--to=martin.langhoff@gmail.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