git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Steffen Prohaska <prohaska@zib.de>
Cc: Theodore Tso <tytso@mit.edu>,
	Git Mailing List <git@vger.kernel.org>,
	Sebastian Schuberth <sschuberth@visageimaging.com>
Subject: Re: [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI
Date: Sun, 11 May 2008 10:31:39 -0700	[thread overview]
Message-ID: <7vy76g4uis.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <183DBDB1-99BE-42C5-91DE-2488046164B7@zib.de> (Steffen Prohaska's message of "Sun, 11 May 2008 09:33:09 +0200")

Steffen Prohaska <prohaska@zib.de> writes:

> On May 6, 2008, at 12:53 PM, Sebastian Schuberth wrote:
>
>> When run from the command line, ECMerge does not automatically use
>> the same
>> settings for a merge / diff that it would use when starting the GUI
>> and loading
>> files manually. In the first case the built-in factory defaults
>> would be used,
>> while in the second case the settings the user has specified in the
>> GUI would
>> be used, which can be misleading. Specifying the "--default" command
>> line
>> option changes this behavior so that always the user specfified GUI
>> settings
>> are used.
>
> I tested the change and propose to take the patch.  I needed,
> however, to remove dos line endings from the patch before it
> applied cleanly.

Thanks, I did not have that "apply" problem.  

Queued.

  reply	other threads:[~2008-05-11 17:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-06 10:53 [PATCH] mergetool: Make ECMerge use the settings as specified by the user in the GUI Sebastian Schuberth
2008-05-06 12:06 ` Sebastian Schuberth
2008-05-11  7:33 ` Steffen Prohaska
2008-05-11 17:31   ` Junio C Hamano [this message]
2008-05-11 19:08     ` Steffen Prohaska

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=7vy76g4uis.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=prohaska@zib.de \
    --cc=sschuberth@visageimaging.com \
    --cc=tytso@mit.edu \
    /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).