chiark / gitweb /
jenkins-build-makebuildserver: handle git update of fdroiddata better
authorHans-Christoph Steiner <hans@eds.org>
Fri, 10 Feb 2017 11:45:04 +0000 (12:45 +0100)
committerHans-Christoph Steiner <hans@eds.org>
Mon, 13 Feb 2017 19:08:45 +0000 (20:08 +0100)
commit3046156a89199fd6b895cee059e0386fac28eb67
treeeabfb401bbb5608caa97dcaab90ea24879d533e0
parent837fc99d74f7694a64f014f3d38a8b07d9e8b3bd
jenkins-build-makebuildserver: handle git update of fdroiddata better

This prevents attempts to merge when there was rebasing, which can fail.
jenkins-build-makebuildserver