mpatibility.
>
>Makes sense for a stand-alone tool.
>
>> I suggest:
>>
>> From c2716458f05893ca88c05ce211a295a330e74590 Mon Sep 17 00:00:00 2001
>> From: René Scharfe
>> Date: Sat, 24 Sep 2016 13:30:22 +0200
>> Subject: [PATCH] git-gui: stop using depre
suggest:
From c2716458f05893ca88c05ce211a295a330e74590 Mon Sep 17 00:00:00 2001
From: René Scharfe
Date: Sat, 24 Sep 2016 13:30:22 +0200
Subject: [PATCH] git-gui: stop using deprecated merge syntax
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called
e-msg and added
>>> --no-log to treat merge.log config suitably. But this works too, and
>>> is much more obvious.
>>>
>>> Tested-by: Johannes Sixt
>
>Reviewed-by: Stefan Beller
>
The only problem I see here is that generally git-gui tries to continu
On Sun, Sep 25, 2016 at 11:39 AM, Junio C Hamano wrote:
> Johannes Sixt writes:
>
>> Am 24.09.2016 um 13:30 schrieb René Scharfe:
>>> Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
>>> warns when it's called like 'git merge HEAD ' because
>>> that syntax is deprecated. Use
Johannes Sixt writes:
> Am 24.09.2016 um 13:30 schrieb René Scharfe:
>> Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
>> warns when it's called like 'git merge HEAD ' because
>> that syntax is deprecated. Use this feature in git-gui and get rid of
>> that warning.
>>
>> Si
Am 24.09.2016 um 13:30 schrieb René Scharfe:
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called like 'git merge HEAD ' because
that syntax is deprecated. Use this feature in git-gui and get rid of
that warning.
Signed-off-by: Rene Scharfe
---
Tested onl
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called like 'git merge HEAD ' because
that syntax is deprecated. Use this feature in git-gui and get rid of
that warning.
Signed-off-by: Rene Scharfe
---
Tested only _very_ lightly!
git-gui/lib/merge.tcl | 7 +
7 matches
Mail list logo
