[PATCH 11/11] android build: remote -u flag from git pull

[Henrik Brautaset Aronsen]

On Sun, Nov 8, 2015 at 1:00 AM, Henrik Brautaset Aronsen <
subsurface at henrik.synth.no> wrote:

> On Sun, Nov 8, 2015 at 12:04 AM, Sebastian Kügler <sebas at kde.org> wrote:
>
>> On Saturday, November 07, 2015 23:45:58 Henrik Brautaset Aronsen wrote:
>> > On Fri, Nov 6, 2015 at 10:57 PM, Sebastian Kügler <sebas at kde.org>
>> wrote:
>> >
>> > > git pull -u isn't known on my systems (recent Debian and Ubuntu), so
>> > > better not use this flag.
>> >
>> > Which Git version do you have?  It's present on my Mac (v2.3.4) and on
>> > Ubuntu 15.04 (v2.1.4).
>> >
>> >        -u, --update-head-ok
>> >            By default git fetch refuses to update the head which
>> corresponds
>>
>> The Ubuntu 15.10 system has git 2.5.0, and Debian unstable one has git
>> 2.6.2, neither has the -u argument.
>>
>
> Weird. I upgraded to 2.6.3 on my Mac, and it still has pull -u.
>

Never mind.  It's should support the -u when fetching according to the
manual, but it doesn't.

Henrik
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20151108/718b6cde/attachment-0001.html>