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.
