All of lore.kernel.org
 help / color / mirror / Atom feed
From: merlyn@stonehenge.com (Randal L. Schwartz)
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: git-merge-recursive-old?
Date: 29 Nov 2006 07:09:06 -0800	[thread overview]
Message-ID: <86zmaawar1.fsf@blue.stonehenge.com> (raw)
In-Reply-To: <Pine.LNX.4.63.0611291606410.30004@wbgn013.biozentrum.uni-wuerzburg.de>

>>>>> "Johannes" == Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

Johannes> Hi,
Johannes> On Wed, 29 Nov 2006, Randal L. Schwartz wrote:

>> I build daily, and apaprently I built git-merge-recursive-old,
>> but it's not in .gitignore.  Needs to be added, no?

Johannes> To the contrary. You need to remove it: v1.4.4-g7cdbff1 removed it, but 
Johannes> you still have the generated file...

yes, I see that now.  It's too bad there's no mechanism for git to inform
trackers that this is not a mistake, but merely human action required.  I
can't immediately think of any way to do it though.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.

      reply	other threads:[~2006-11-29 15:09 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-29 14:57 git-merge-recursive-old? Randal L. Schwartz
2006-11-29 15:07 ` git-merge-recursive-old? Johannes Schindelin
2006-11-29 15:09   ` Randal L. Schwartz [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=86zmaawar1.fsf@blue.stonehenge.com \
    --to=merlyn@stonehenge.com \
    --cc=Johannes.Schindelin@gmx.de \
    --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.