Re: [OpenWrt-Devel] [PATCH] [scripts] scripts/feeds: ensure that --ff is enabled

2013-09-02 Thread John Szakmeister
On Mon, Sep 2, 2013 at 2:26 PM, Florian Fainelli wrote: > Le mercredi 3 juillet 2013 15:32:21 John Szakmeister a écrit : >> Users may have merge.ff set to false, which will force merge commits to >> be generated. The intent here is to have a fast-forward merge when >> possible, so let's make sure

Re: [OpenWrt-Devel] [PATCH] [scripts] scripts/feeds: ensure that --ff is enabled

2013-09-02 Thread Florian Fainelli
Le mercredi 3 juillet 2013 15:32:21 John Szakmeister a écrit : > Users may have merge.ff set to false, which will force merge commits to > be generated. The intent here is to have a fast-forward merge when > possible, so let's make sure fast-forwards are enabled. > > Signed-off-by: John Szakmeist

[OpenWrt-Devel] [PATCH] [scripts] scripts/feeds: ensure that --ff is enabled

2013-07-03 Thread John Szakmeister
Users may have merge.ff set to false, which will force merge commits to be generated. The intent here is to have a fast-forward merge when possible, so let's make sure fast-forwards are enabled. Signed-off-by: John Szakmeister --- scripts/feeds | 2 +- 1 file changed, 1 insertion(+), 1 deletion