From: Johannes Sixt <j6t@kdbg.org>
To: Josef Ridky <jridky@redhat.com>
Cc: git@vger.kernel.org
Subject: Re: Feature Request: user defined suffix for temp files created by git-mergetool
Date: Wed, 5 Oct 2016 23:04:17 +0200 [thread overview]
Message-ID: <e3306f5a-1fb3-bd66-48ac-72b75fc7681c@kdbg.org> (raw)
In-Reply-To: <1499287628.1324571.1475653631366.JavaMail.zimbra@redhat.com>
Am 05.10.2016 um 09:47 schrieb Josef Ridky:
> Add support for user defined suffix part of name of temporary files
> created by git mergetool
Do I understand correctly that your users have problems to identify
which of the "_BASE_", "_LOCAL_", "_REMOTE_" and "_BACKUP_" files they
must edit? I agree that there is some room for improvement.
The goal is that you want the user to see the label, e.g., "_EDIT_THIS_"
instead of "_LOCAL_". Now you have to teach your users that they have to
pass --local=_EDIT_THIS_. Why don't you just teach your users to edit
the file labeled "_LOCAL_"?
Therefore, I think that your patch as written does not help to reduce
the confusion. It may be a building block for further improvement, but
if you stop here, it is pointless.
> SYNOPSIS
> --------
> [verse]
> -'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [<file>...]
> +'git mergetool' [--tool=<tool>] [-y | --[no-]prompt] [--local=<name>] [--remote=<name>] [--backup=<name>] [--base=<name>] [<file>...]
>
> DESCRIPTION
> -----------
> @@ -79,6 +79,30 @@ success of the resolution after the custom tool has exited.
> Prompt before each invocation of the merge resolution program
> to give the user a chance to skip the path.
>
> +--local=<name>::
> + Use string from <name> as part of suffix of name of temporary
> + file (local) for merging. If not used or is equal with any
> + other (remote|backup|base), default value is used.
> + Default suffix is LOCAL.
> +
> +--remote=<name>::
> + Use string from <name> as part of suffix of name of temporary
> + file (remote) for merging. If not used or is equal with any
> + other (local|backup|base), default value is used.
> + Default suffix is REMOTE.
> +
> +--backup=<name>::
> + Use string from <name> as part of suffix of name of temporary
> + file (backup) for merging. If not used or is equal with any
> + other (local|remote|base), default value is used.
> + Default suffix is BACKUP.
> +
> +--base=<name>::
> + Use string from <name> as part of suffix of name of temporary
> + file (base) for merging. If not used or is equal with any
> + other (local|remote|backup), default value is used.
> + Default suffix is BASE.
next prev parent reply other threads:[~2016-10-05 21:04 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
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 [this message]
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=e3306f5a-1fb3-bd66-48ac-72b75fc7681c@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=jridky@redhat.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.
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).