Hi Johannes, thank you very much for this reply.
| Sent: Wednesday, October 5, 2016 11:04:17 PM | | 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_"? The goal of this request is not to teach our users, how to change labels using git mergetool. The point is, that git mergetool is used by several of our packages in specific use-case. If I understand well, git mergetool expecting comparing LOCAL changes against REMOTE status in git repository. We use git mergetool to compare LOCAL OLD version of package with LOCAL NEW version of package. In this use-case is really nonsense to label old version of package as LOCAL and new version of package as REMOTE. This is point of confusion. This is the reason, why I am asking for the possibility to change the suffix of temporary files, which are shown to user for comparison. And as well, users do not open these files themselves, these files are automatically opened by our packages, so users are not responsible for the name of temporary files. They just see the results. | | 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. | I agree, that this patch is written as general as possible and can possibly bring more confusion than benefits. I will make new version of this patch, where will be just simple switch between LOCAL/REMOTE and NEW/OLD. | > 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. | |
