From: Josef Ridky <jridky@redhat.com>
To: Anatoly Borodin <anatoly.borodin@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Feature Request: user defined suffix for temp files created by git-mergetool
Date: Tue, 4 Oct 2016 01:18:47 -0400 (EDT) [thread overview]
Message-ID: <597741871.671633.1475558327029.JavaMail.zimbra@redhat.com> (raw)
In-Reply-To: <CACNzp2mANqmciMzvCahM_+=RnZYtU1SK9DRS2BmQru1fZY_wUQ@mail.gmail.com>
Hi Anatoly,
| Sent: Monday, October 3, 2016 5:18:44 PM
|
| Hi Josef,
|
|
| On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky <jridky@redhat.com> wrote:
| > In several projects, we are using git mergetool for comparing files from
| > different folders.
| > Unfortunately, when we have opened three files for comparing using meld
| > tool (e.q. Old_version -- Result -- New_version),
| > we can see only name of temporary files created by mergetool in the labels
| > (e.g. foo_REMOTE -- foo_BASE -- foo_LOCAL)
| > and users (and sometime even we) are confused, which of the files should
| > they edit and save.
|
| `git mergetool` just creates temporary files (with some temporary
| names) and calls `meld` (or `vimdiff`, etc) with the file names as
| parameters. So why wouldn't you call `meld` with the file names you
| want?
Because files, that we want, are temporary files created by git mergetool and we are not able to change their name.
Regards
Josef
next prev parent reply other threads:[~2016-10-04 5:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <88486231.114620.1475474318974.JavaMail.zimbra@redhat.com>
2016-10-03 6:36 ` Feature Request: user defined suffix for temp files created by git-mergetool Josef Ridky
2016-10-03 15:18 ` Anatoly Borodin
2016-10-04 5:18 ` Josef Ridky [this message]
2016-10-05 9:47 ` David Aguilar
2016-10-05 10:19 ` Josef Ridky
2016-10-05 7:47 ` Josef Ridky
2016-10-05 16:05 ` Junio C Hamano
2016-10-06 6:47 ` Josef Ridky
2016-10-05 21:04 ` Johannes Sixt
2016-10-06 7:21 ` Josef Ridky
2016-10-06 12:43 ` [PATCH 1/2] " Josef Ridky
2016-10-06 13:09 ` [PATCH 2/2] " Josef Ridky
2016-10-06 17:06 ` Junio C Hamano
2016-10-12 8:24 ` [PATCH v2 " Josef Ridky
2016-10-12 17:59 ` Junio C Hamano
2016-10-13 4:55 ` David Aguilar
2016-10-13 5:13 ` [PATCH 1/2] " David Aguilar
2016-10-06 16:58 ` Junio C Hamano
2016-10-06 15:54 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=597741871.671633.1475558327029.JavaMail.zimbra@redhat.com \
--to=jridky@redhat.com \
--cc=anatoly.borodin@gmail.com \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).