git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Voltage Spike <voltspike@gmail.com>,
	git@vger.kernel.org
Subject: Re: [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Date: Fri, 15 Feb 2008 09:32:57 -0800	[thread overview]
Message-ID: <7vlk5mgm5y.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: alpine.LSU.1.00.0802131113360.30505@racer.site

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

> Maybe even both.  
>
> As Linus has stated in the other reply, up to three lines between two 
> conflicts could be "merged" with the conflicts by default, because less or 
> equally much screen estate would used.
>
> So I am thinking about an interface that is not too painful.

I think there is no excuse not to coalesce hunks separated by
three lines or less, so we can first get immediate improvement
without any configuration or tweaking.  My "less than N alnums"
was ill thought out overengineering, and Linus's improvement is
much cleaner.

  reply	other threads:[~2008-02-15 17:33 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-02-12 22:16 Merge-Recursive Improvements Voltage Spike
2008-02-12 23:03 ` Stefan Monnier
2008-02-12 23:11 ` Junio C Hamano
2008-02-12 23:48 ` Linus Torvalds
2008-02-13  0:05   ` Johannes Schindelin
2008-02-13  1:10     ` [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM Johannes Schindelin
2008-02-13  1:34       ` Junio C Hamano
2008-02-13 11:16         ` Johannes Schindelin
2008-02-15 17:32           ` Junio C Hamano [this message]
2008-02-15 18:17             ` Linus Torvalds
2008-02-15 18:23               ` Johannes Schindelin
2008-02-17 19:06               ` Johannes Schindelin
2008-02-17 19:07                 ` [PATCH 1/2] xdl_merge(): make XDL_MERGE_ZEALOUS output simpler Johannes Schindelin
2008-02-17 19:07                   ` [PATCH(RFC) 2/2] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM Johannes Schindelin
2008-02-18  8:35                   ` [PATCH 1/2] xdl_merge(): make XDL_MERGE_ZEALOUS output simpler Junio C Hamano
2008-02-18 11:33                     ` Johannes Schindelin
2008-02-13  2:06       ` [PATCH] xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM Linus Torvalds
2008-02-13 11:22         ` Johannes Schindelin
2008-02-13  7:39 ` Merge-Recursive Improvements Johannes Sixt
2008-02-13  8:17   ` Steffen Prohaska
2008-02-13  8:21   ` Voltage Spike
2008-02-13  8:46     ` Johannes Sixt
2008-02-15 19:21   ` 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=7vlk5mgm5y.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=voltspike@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 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).