From: Alex Riesen <raa.lkml@gmail.com>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Avoid excessive rewrites in merge-recursive
Date: Thu, 26 Apr 2007 00:13:41 +0200 [thread overview]
Message-ID: <20070425221341.GH30061@steel.home> (raw)
In-Reply-To: <7vodlcup9e.fsf@assigned-by-dhcp.cox.net>
Junio C Hamano, Wed, Apr 25, 2007 23:18:21 +0200:
>
> > Just as you may have thought merge-recursive cannot get any uglier
> > someone comes and does just this: puts another level of indentation.
>
> It really was painful for me the last time I touched the file,
> so I share that feeling. The complexity of this program is
> getting out of hand.
>
> Probably we would want a refactoring before doing something like
> this.
>
I want. I just can't afford something like this lately.
I'm even saving on "am"s and "not"s! :)
next prev parent reply other threads:[~2007-04-25 22:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-25 20:06 [PATCH] Avoid excessive rewrites in merge-recursive Alex Riesen
2007-04-25 21:18 ` Junio C Hamano
2007-04-25 22:13 ` Alex Riesen [this message]
2007-04-26 19:13 ` [PATCH] Ignore merged status of the file-level merge Alex Riesen
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=20070425221341.GH30061@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.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).