git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Fredrik Kuivinen <freku045@student.liu.se>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] A new merge algorithm, take 2
Date: Sun, 28 Aug 2005 02:42:21 -0700	[thread overview]
Message-ID: <7vslwuo0si.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <20050828080341.GA1928@c165.ib.student.liu.se> (Fredrik Kuivinen's message of "Sun, 28 Aug 2005 10:03:41 +0200")

Fredrik Kuivinen <freku045@student.liu.se> writes:

> I didn't know you could do things like that with git-ls-files :) But
> yeah, it's certainly less intrusive to do it that way. It will
> probably simplify things a great deal too. Wouldn't '--unmerged' be
> the appropriate flag to use for git-ls-files in this case?

Certainly.  I was trying to see if you are paying attention ;-).

      reply	other threads:[~2005-08-28  9:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-08-27 20:51 [PATCH] A new merge algorithm, take 2 Fredrik Kuivinen
2005-08-28  5:23 ` Junio C Hamano
2005-08-28  8:03   ` Fredrik Kuivinen
2005-08-28  9:42     ` Junio C Hamano [this message]

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=7vslwuo0si.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=freku045@student.liu.se \
    --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 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).