From: Sebastian Schuberth <sschuberth@gmail.com>
To: Chris Packham <judge.packham@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
charles@hashpling.org
Subject: Re: Adding Beyond Compare as a merge tool, was: Re: What's cooking in git.git (Feb 2011, #05; Wed, 23)
Date: Sun, 27 Feb 2011 12:15:50 +0100 [thread overview]
Message-ID: <AANLkTinByZS0yQ6TNTwp74kW3yvTg8G_PQN3F99MKR2w@mail.gmail.com> (raw)
In-Reply-To: <AANLkTimWPwCFgnAYz_jJ3Yw5QWvPNhPxq=j502UorEot@mail.gmail.com>
On Sun, Feb 27, 2011 at 11:57, Sebastian Schuberth <sschuberth@gmail.com> wrote:
>> with your suggestion. We should probably make use of the -title options
>> to remove ambiguity.
>
> Good idea, I'll look into this.
Given that the -title options actually replace the display of the file
name (instead of displaying the title in addition), I'd prefer not to
make use of these options. In fact, the file names Git uses for
merging already contain "BASE", "LOCAL", "REMOTE", so there should be
no real need for additional titles, IMHO.
I'll push out the updated series now.
--
Sebastian Schuberth
prev parent reply other threads:[~2011-02-27 11:15 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 23:26 What's cooking in git.git (Feb 2011, #05; Wed, 23) Junio C Hamano
2011-02-23 23:48 ` ab/i18n (What's cooking in git.git (Feb 2011, #05; Wed, 23)) Jonathan Nieder
2011-02-24 1:16 ` Junio C Hamano
2011-02-24 2:55 ` Ævar Arnfjörð Bjarmason
2011-02-24 3:14 ` Jonathan Nieder
2011-02-24 10:38 ` Ævar Arnfjörð Bjarmason
2011-02-24 10:45 ` Jonathan Nieder
2011-02-24 11:00 ` Jonathan Nieder
2011-02-25 21:48 ` Ævar Arnfjörð Bjarmason
2011-02-26 5:14 ` Jonathan Nieder
2011-02-24 4:00 ` ab/i18n Jonathan Nieder
2011-02-24 9:56 ` ab/i18n (What's cooking in git.git (Feb 2011, #05; Wed, 23)) Erik Faye-Lund
2011-02-24 10:27 ` ab/i18n Jonathan Nieder
2011-02-24 19:11 ` ab/i18n Junio C Hamano
2011-02-24 10:40 ` ab/i18n (What's cooking in git.git (Feb 2011, #05; Wed, 23)) Ævar Arnfjörð Bjarmason
2011-02-23 23:52 ` What's cooking in git.git (Feb 2011, #05; Wed, 23) Johan Herland
2011-02-24 0:43 ` Junio C Hamano
2011-02-24 1:04 ` Johan Herland
2011-02-24 0:32 ` Ævar Arnfjörð Bjarmason
2011-02-24 0:57 ` Junio C Hamano
2011-02-24 1:37 ` Ævar Arnfjörð Bjarmason
2011-02-24 1:59 ` Junio C Hamano
2011-02-24 2:07 ` Ævar Arnfjörð Bjarmason
2011-02-24 9:45 ` Erik Faye-Lund
2011-02-24 17:47 ` Ævar Arnfjörð Bjarmason
2011-02-24 22:39 ` Jonathan Nieder
2011-02-25 1:45 ` [msysGit] " Johannes Schindelin
2011-02-25 9:05 ` Kirill Smelkov
2011-02-25 11:11 ` Johannes Schindelin
2011-02-25 19:24 ` Kirill Smelkov
2011-02-25 21:54 ` Johannes Schindelin
2011-02-26 11:07 ` Kirill Smelkov
2011-02-26 19:07 ` Kirill Smelkov
2011-02-26 19:58 ` cross-compiling msys-1.0.dll, was " Johannes Schindelin
2011-03-12 13:18 ` Kirill Smelkov
2011-03-12 15:38 ` Johannes Schindelin
2011-02-27 14:28 ` Johannes Schindelin
2011-03-12 13:16 ` Kirill Smelkov
2011-02-26 10:24 ` Adding Beyond Compare as a merge tool, was: " Sebastian Schuberth
2011-02-26 10:33 ` Junio C Hamano
2011-02-26 10:48 ` Sebastian Schuberth
2011-02-27 5:38 ` Chris Packham
2011-02-27 9:09 ` Junio C Hamano
2011-02-27 10:58 ` Sebastian Schuberth
2011-02-27 10:57 ` Sebastian Schuberth
2011-02-27 11:15 ` Sebastian Schuberth [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=AANLkTinByZS0yQ6TNTwp74kW3yvTg8G_PQN3F99MKR2w@mail.gmail.com \
--to=sschuberth@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=judge.packham@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).