From: Martin Langhoff <martin.langhoff@gmail.com>
To: Alexandre Julliard <julliard@winehq.org>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: contrib/ area
Date: Sat, 18 Feb 2006 01:24:55 +1300 [thread overview]
Message-ID: <46a038f90602170424u59f84ac8l1311d80cd7251394@mail.gmail.com> (raw)
In-Reply-To: <873biikx6k.fsf@wine.dyndns.org>
On 2/18/06, Alexandre Julliard <julliard@winehq.org> wrote:
> Is there interest in an emacs interface for git? I posted a first
> version (http://marc.theaimsgroup.com/?l=git&m=113313040724346&w=2)
> some time ago, I'd be happy to send you a patch with my latest version
> if you want to include it.
Yes, please. I'd really like to see it help handle conflicts, and
provide multi-pane views during merges. We are in love with emacs diff
mode for conflict resolution when you end up with .rej files, but it
doesn't kick in properly with the inline conflict markers :-(
cheers,
m
next prev parent reply other threads:[~2006-02-17 12:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-17 11:07 contrib/ area Junio C Hamano
2006-02-17 12:05 ` Alexandre Julliard
2006-02-17 12:24 ` Martin Langhoff [this message]
2006-02-18 6:49 ` Junio C Hamano
2006-02-18 16:49 ` Alexandre Julliard
2006-02-19 21:18 ` Sam Vilain
2006-02-19 21:56 ` Alexandre Julliard
2006-02-17 12:36 ` Aneesh Kumar
2006-02-18 6:50 ` Junio C Hamano
2006-02-18 8:38 ` Aneesh Kumar
2006-02-18 9:02 ` Junio C Hamano
2006-02-21 1:41 ` Ben Clifford
2006-02-21 3:58 ` Junio C Hamano
[not found] ` <b7bc5ebe0602202110l53418b32q@mail.gmail.com>
2006-02-21 7:43 ` 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=46a038f90602170424u59f84ac8l1311d80cd7251394@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=julliard@winehq.org \
--cc=junkio@cox.net \
/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).