On Thu, Oct 06, 2016 at 08:43:02AM -0400, Josef Ridky wrote:
> This is the first of two variant for request to add option to change
> suffix of name of temporary files generated by git mergetool. This
> change is requested for cases, when is git mergetool used for local
> comparision between two ve
On Wed, Oct 12, 2016 at 10:59:46AM -0700, Junio C Hamano wrote:
> Josef Ridky writes:
>
> > This is update of the second variant for request to add option to change
> > suffix of name of temporary files generated by git mergetool. This
> > change is requested for cases, when is git mergetool used
Josef Ridky writes:
> This is update of the second variant for request to add option to change
> suffix of name of temporary files generated by git mergetool. This
> change is requested for cases, when is git mergetool used for local
> comparison between two version of same package during package
This is update of the second variant for request to add option to change
suffix of name of temporary files generated by git mergetool. This
change is requested for cases, when is git mergetool used for local
comparison between two version of same package during package rebase.
Signed-off-by: Josef
Josef Ridky writes:
> + --local=*)
> + temp_name=${1#--local=}
> + if [ "$temp_name" != "" ] && [ "$temp_name" != "$REMOTE_NAME" ]
> && [ "$temp_name" != "$BASE_NAME" ] && [ "$temp_name" != "$BACKUP_NAME" ]
> + then
> + LOCAL_NAME=$temp
Josef Ridky writes:
> I agree, that this patch is written as general as possible and can
> possibly bring more confusion than benefits.
I am not sure about that. Other people would have similar but
different workflow needs where they compare local new one with local
old one that would be helped
Johannes Sixt writes:
> 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.
Yup, you're right.
This is the first of two variant for request to add option to change
suffix of name of temporary files generated by git mergetool. This
change is requested for cases, when is git mergetool used for local
comparision between two version of same package during package rebase.
Signed-off-by: Josef Ri
This is the second of two variant for request to add option to change
suffix of name of temporary files generated by git mergetool. This
change is requested for cases, when is git mergetool used for local
comparison between two version of same package during package rebase.
Signed-off-by: Josef Ri
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
Hi Junio,
thank you very much for the tips. I'll make new patch with a simpler code.
Josef
| Sent: Wednesday, October 5, 2016 6:05:59 PM
| Josef Ridky writes:
|
| > Hi,
| >
| > I have just realize, that my attachment has been cut off from my previous
| > message.
| > Below you can find patch w
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 agre
Josef Ridky writes:
> Hi,
>
> I have just realize, that my attachment has been cut off from my previous
> message.
> Below you can find patch with requested change.
>
> Add support for user defined suffix part of name of temporary files
> created by git mergetool
> ---
The first two paragraphs
Hi David,
thank you very much for your reply.
Today I realized, that my attachment has been cut off, so I sent it in the
morning [1].
I believe, that most of answer can be find in my previous email from this
morning.
Only change, that should be done by this request is add possibility to edit
h
On Tue, Oct 04, 2016 at 01:18:47AM -0400, Josef Ridky wrote:
> Hi Anatoly,
>
>
> | Sent: Monday, October 3, 2016 5:18:44 PM
> |
> | Hi Josef,
> |
> |
> | On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
> | > In several projects, we are using git mergetool for comparing files from
> | > dif
Hi,
I have just realize, that my attachment has been cut off from my previous
message.
Below you can find patch with requested change.
Add support for user defined suffix part of name of temporary files
created by git mergetool
---
Documentation/git-mergetool.txt | 26 -
gi
Hi Anatoly,
| Sent: Monday, October 3, 2016 5:18:44 PM
|
| Hi Josef,
|
|
| On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
| > In several projects, we are using git mergetool for comparing files from
| > different folders.
| > Unfortunately, when we have opened three files for comparing u
Hi Josef,
On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky 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 s
Hello,
I would like to request for implementing feature described in subject.
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),
19 matches
Mail list logo
