All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jon Loeliger <jdl@freescale.com>
To: git@vger.kernel.org
Subject: Re: Expected Behavior?
Date: Mon, 07 Nov 2005 21:07:13 -0600	[thread overview]
Message-ID: <E1EZJpJ-0002S6-8S@jdl.com> (raw)
In-Reply-To: 7vd5ldusg7.fsf@assigned-by-dhcp.cox.net


> It appears that as the everyday workhorse, using Daniel's
> git-merge-resolve is stable through git-merge have proven stable
> enough.  So here is a question.  Do people mind if 'git-resolve'
> and 'git-octopus' are dropped before 1.0?  This means 2 less
> programs in your /usr/bin ;-).

It's OK with me. :-)

jdl

             reply	other threads:[~2005-11-08  3:07 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-11-08  3:07 Jon Loeliger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2005-11-09 13:38 Expected Behavior? Jon Loeliger
2005-11-09 20:38 ` Junio C Hamano
2005-11-09  2:58 Jon Loeliger
2005-11-09  6:28 ` Junio C Hamano
2005-11-08  3:43 Jon Loeliger
2005-11-08  6:00 ` Junio C Hamano
2005-11-08  9:56   ` Petr Baudis
2005-11-08 21:03   ` Fredrik Kuivinen
2005-11-08 21:41     ` Junio C Hamano
2005-11-08 22:53       ` Fredrik Kuivinen
2005-11-09  5:50         ` Junio C Hamano
2005-11-09  8:19           ` Fredrik Kuivinen
2005-11-10 20:34             ` Petr Baudis
2005-11-10 22:52               ` Junio C Hamano
2005-11-10 23:22                 ` Petr Baudis
2005-11-09 11:24     ` Petr Baudis
2005-11-09 23:04       ` Martin Langhoff
2005-11-09 23:12         ` Petr Baudis
2005-11-09 23:43           ` Martin Langhoff
2005-11-09 23:49             ` Petr Baudis
2005-11-10  2:47               ` Martin Langhoff
2005-11-10 19:34                 ` Petr Baudis
2005-11-10 19:54                   ` Martin Langhoff
2005-11-10 20:10                     ` Petr Baudis
2005-11-09 23:36         ` Junio C Hamano
2005-11-09 23:42           ` Petr Baudis
2005-11-10  0:03             ` Junio C Hamano
2005-11-06 22:16 Jon Loeliger
2005-11-07  1:38 ` Junio C Hamano
2005-11-07  2:01 ` 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=E1EZJpJ-0002S6-8S@jdl.com \
    --to=jdl@freescale.com \
    --cc=git@vger.kernel.org \
    /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.