All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Caleb Cushing <xenoterracide@gmail.com>
Cc: Charles Bailey <charles@hashpling.org>, git@vger.kernel.org
Subject: Re: [PATCH] mergetool merge/skip/abort
Date: Fri, 23 Jan 2009 09:26:32 -0800	[thread overview]
Message-ID: <7vwscmue5z.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <81bfc67a0901230716i166bfc4chd9a5c0990b0cd3b6@mail.gmail.com> (Caleb Cushing's message of "Fri, 23 Jan 2009 10:16:44 -0500")

Caleb Cushing <xenoterracide@gmail.com> writes:

> so does my patch satisfy now? what's it take to get it included in the
> next version of git?

I do not use mergetool myself so I generally do not pay attention to
patches on this tool, but I would want to pick up ones that people
involved in mergetool discussion can agree to be good patches.

There are a few mergetool updates in flight from various authors.  How
does your submission compare with others' in both form/presentation and
clarity of logic (remember, I am not keeping track)?

  reply	other threads:[~2009-01-23 17:28 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-21 14:37 [PATCH] mergetool merge/skip/abort Caleb Cushing
2009-01-21 16:17 ` Caleb Cushing
2009-01-21 16:33   ` Johannes Schindelin
2009-01-21 18:49   ` Markus Heidelberg
2009-01-22  5:07     ` Caleb Cushing
2009-01-21 17:04 ` Charles Bailey
2009-01-22 14:17   ` Caleb Cushing
2009-01-22 14:22     ` Charles Bailey
2009-01-23 15:16       ` Caleb Cushing
2009-01-23 17:26         ` Junio C Hamano [this message]
2009-01-24 18:36           ` Caleb Cushing
2009-01-24 21:45             ` Nanako Shiraishi
2009-01-25  0:18               ` Caleb Cushing
2009-01-25  5:20               ` Junio C Hamano
2009-01-26 22:58           ` Theodore Tso
2009-01-27 22:09             ` Charles Bailey
2009-01-27 22:37               ` Junio C Hamano

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=7vwscmue5z.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    --cc=xenoterracide@gmail.com \
    /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.