-by: Josef Ridky <jri...@redhat.com>
---
Documentation/git-mergetool.txt | 22 ++-
git-mergetool.sh| 60 +
2 files changed, 76 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergeto
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
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
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
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 <jri...@redhat.com> writes:
|
| > Hi,
| >
| > I have just realize, that my attachment has been cut off from my previous
| >
://marc.info/?l=git=147565363609649=2
Regards
Josef
| Sent: Wednesday, October 5, 2016 11:47:06 AM
|
| 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,
| > |
| > |
| >
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 -
Hi Anatoly,
| Sent: Monday, October 3, 2016 5:18:44 PM
|
| Hi Josef,
|
|
| On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky <jri...@redhat.com> wrote:
| > In several projects, we are using git mergetool for comparing files from
| > different folders.
| > Unfortunately, when we ha
this unfortunate issue by the easiest way.
I have already prepared patch, which can be applied to resolve this request
(see in attachment).
Best regards
Josef Ridky
Associate Software Engineer
Core Services Team
Red Hat Czech, s.r.o.
9 matches
Mail list logo